summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-15 22:12:46 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-15 22:12:46 -0400
commit72813114685613f72bc2d7b5d54596c14a5cf0f2 (patch)
treea75d2b93d705872dcb2d477cac3d22dd98d6b4de
parent431fe1339522f66e41e001fc7083fcf3b45b06be (diff)
parent90683913699909e26bb8c8fb3235b23370bebe23 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn24
-rw-r--r--doc/design/assistant/polls/prioritizing_special_remotes.mdwn2
2 files changed, 25 insertions, 1 deletions
diff --git a/doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn b/doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn
new file mode 100644
index 000000000..1df26fc81
--- /dev/null
+++ b/doc/bugs/Crash_trying_to_sync_with_a_repo_over_ssh.mdwn
@@ -0,0 +1,24 @@
+What steps will reproduce the problem?
+
+I create a new annex, added in a bunch of files.
+
+I cloned this annex to another machine, where I already had those files, so I copied them into a directory named "foo", did "git annex add foo", and then did "git rm -r foo", and git commit'd my clone of the annex.
+
+Then I try to "git annex sync" with the remote.
+
+What is the expected output? What do you see instead?
+
+I don't know, I've never used git-annex before. This is what I get each time:
+
+ Hermes ~/Products/tmp/Movies (master) $ ga sync
+ git-annex-shell: Prelude.(!!): index too large
+
+What version of git-annex are you using? On what operating system?
+
+It's the 'master' as of yesterday: c504f4025fec49e62601fbd4a3cd8f1270c7d221
+
+I'm on OS X 10.8.2, using GHC 7.6.1. The annex in question has 38G in a few hundred files.
+
+Please provide any additional information below.
+
+I'm willing to help track this down!
diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
index e9662f903..b576c9ed4 100644
--- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
+++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn
@@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
-[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 57 "My phone (or MP3 player)" 14 "Tahoe-LAFS" 5 "OpenStack SWIFT" 17 "Google Drive"]]
+[[!poll open=yes 15 "Amazon S3 (done)" 9 "Amazon Glacier" 7 "Box.com" 57 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 17 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they