Merge branch 'master' of ssh://git-annex.branchable.com

6 files changed, 142 insertions, 0 deletions

diff --git a/doc/bugs/Out_of_memory_error_in_fsck_whereis_find_and_status_cmds/comment_1_3aef6ca929fad198f2dda0868f2d49cb._comment b/doc/bugs/Out_of_memory_error_in_fsck_whereis_find_and_status_cmds/comment_1_3aef6ca929fad198f2dda0868f2d49cb._comment
new file mode 100644
index 000000000..d410f960b
--- /dev/null
+++ b/doc/bugs/Out_of_memory_error_in_fsck_whereis_find_and_status_cmds/comment_1_3aef6ca929fad198f2dda0868f2d49cb._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-03-03T18:34:41Z"
+ content="""
+git-annex is designed to run in constant memory. It should never use a lot of memory.
+
+What file causes the problem? You show git-annex whereis successfully processing 1wolf14.zip, so that file is apparently not the problem. It's probably the *next* file you told whereis to run on. You can get a file list with `git ls-files`
+
+Apparently something bad is happening when it tries to calculate the key used by the problem file.
+
+What does the file look like? You're using direct mode so it may or may not be a symlink. If it's a symlink, show it. If not, show the output of: `echo HEAD:./$filename | git cat-file --batch`
+
+----
+
+The stuff about \"dead symlinks\" etc is all a distraction AFAICS. git-annex allows you to remove content from your repository in multiple ways. That content could be present in another repository (git annex whereis would tell you), or the last copy of it could have been deleted. You can run \"git annex log\" on a file to show where the content was located historically.
+"""]]
diff --git a/doc/bugs/When_syncing_two_repositories__44___git_annex_uses_9x_times_diskspace/comment_10_037a6dd6e15ef5f789a1f364f7507b53._comment b/doc/bugs/When_syncing_two_repositories__44___git_annex_uses_9x_times_diskspace/comment_10_037a6dd6e15ef5f789a1f364f7507b53._comment
new file mode 100644
index 000000000..f973238d8
--- /dev/null
+++ b/doc/bugs/When_syncing_two_repositories__44___git_annex_uses_9x_times_diskspace/comment_10_037a6dd6e15ef5f789a1f364f7507b53._comment
@@ -0,0 +1,45 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
+ nickname="Laszlo"
+ subject="comment 10"
+ date="2013-03-03T18:31:24Z"
+ content="""
+The problem with restarting, that it seems, it puts everything one more time into .git.
+(if we ignore the logging problem).
+
+Right now, here is the:
+    $ du -ak . | sort -nr | cut -f2 | xargs -d '\n' du -sh |head -n 30 -
+output:
+    8,7G	.
+    8,0G	./.git
+    6,3G	./.git/annex
+    3,5G	./.git/annex/daemon.log.2
+    2,5G	./.git/annex/daemon.log
+    1,7G	./.git/objects
+    742M	./mydir
+    640M	./mydir/wp
+    616M	./mydir/wp/wd
+    314M	./mydir/wp/wd/2012
+    226M	./mydir/wp/wd/2011
+    227M	./.git/annex/daemon.log.1
+    109M	./.git/annex/objects
+
+If you observe ./.git/objects dir, is 1,7G, 
+while yesterday it was 742M (see my first comment).
+
+Other problem, that once it runs out of space, threads crashes:
+    Pusher crashed: user error (git [\"--git-dir=/home/user/down/annex/.git\",\"--work-tree=/home/user/down/annex\",\"update-index\",\"-z\",\"--index-info\"] exited 128)
+    NetWatcherFallback crashed: fd:28: hGetLine: end of file
+    DaemonStatus crashed: /home/user/down/annex/.git/annex/daemon.status.tmp7564: hClose: resource exhausted (No space left on device)
+
+Right now, I think I tested everything I could. 
+
+Where is the autobuild? This one still is 2013 feb 27:
+http://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386.tar.gz
+
+Anyway, once the new version is out, I will retest this experiment.
+
+Best, 
+ Laszlo
+
+"""]]
diff --git a/doc/bugs/When_syncing_two_repositories__44___git_annex_uses_9x_times_diskspace/comment_11_614e4110188fc6474e7da50fc4281e13._comment b/doc/bugs/When_syncing_two_repositories__44___git_annex_uses_9x_times_diskspace/comment_11_614e4110188fc6474e7da50fc4281e13._comment
new file mode 100644
index 000000000..38d9bb621
--- /dev/null
+++ b/doc/bugs/When_syncing_two_repositories__44___git_annex_uses_9x_times_diskspace/comment_11_614e4110188fc6474e7da50fc4281e13._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 11"
+ date="2013-03-03T18:36:31Z"
+ content="""
+The autobuild is linked to on [[install/Linux_standalone]]
+
+I don't understand how you're \"restarting\" and not deleting the old .git repository. The right way would be to stop the assistant, run \"git annex uninit\", and then remove \".git\"
+"""]]
diff --git a/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_2_21c0f7f328cb51080fbd97e086c47a30._comment b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_2_21c0f7f328cb51080fbd97e086c47a30._comment
new file mode 100644
index 000000000..5eb511b65
--- /dev/null
+++ b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_2_21c0f7f328cb51080fbd97e086c47a30._comment
@@ -0,0 +1,37 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 2"
+ date="2013-03-03T18:44:35Z"
+ content="""
+I rebuilt and ran with --debug, and started up git annex.  It behaved itself. 
+
+I tried restarting it, unplugging and plugging back in my USB drive to see if it provoked any problems -- none.
+
+I decided to try adding something.  I added a music video to my Movies/Music directory.  It uploaded it to my ssh remote but not to the USB drive and, bizarrely, when I use \"git annex whereis\" it doesn't show it as existing *anywhere*:
+
+    annex$ git annex whereis Movies/Music/Tanlines\ -\ All\ Of\ Me.flv
+    annex$ 
+
+It does in fact exist in all three repos!  The link is there:
+
+annex$ ls -l Movies/Music/Tanlines\ -\ All\ Of\ Me.flv 
+lrwxr-xr-x  1 ed  staff  206 Mar  3 13:18 Movies/Music/Tanlines - All Of Me.flv -> ../../.git/annex/objects/0k/j6/SHA256E-s37822147--c9df1d6c9f6d2d72e039de9705ea4673160da32eb0cc9ea87e65003506d9297d.flv/SHA256E-s37822147
+
+the object is there!
+
+annex$ ls -l .git/annex/objects/0k/j6/SHA256E-s37822147--c9df1d6c9f6d2d72e039de9705ea4673160da32eb0cc9ea87e65003506d9297d.flv/SHA256E-s37822147--c9df1d6c9f6d2d72e039de9705ea4673160da32eb0cc9ea87e65003506d9297d.flv
+-r--r--r--  1 ed  staff  37822147 Mar  3 13:17 .git/annex/objects/0k/j6/SHA256E-s37822147--c9df1d6c9f6d2d72e039de9705ea4673160da32eb0cc9ea87e65003506d9297d.flv/SHA256E-s37822147--c9df1d6c9f6d2d72e039de9705ea4673160da32eb0cc9ea87e65003506d9297d.flv
+
+The corresponding object also exists in the .git/annex/objects directory of the USB remote and the ssh remote.
+
+here's a pastebin of the daemon.log: http://pastebin.com/BGRBQ6Rx
+
+Shut down the daemon to see if that changed anything; nope.  \"Whereis\" still comes up blank.  Tried a git annex fsck --fast to see if that changed anything; nope.  \"Whereis\" still comes up blank.
+
+Any ideas?  Is the log revealing at all?
+
+
+
+
+"""]]
diff --git a/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_3_3287b2f25f3b5ae4c27f4748694563ee._comment b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_3_3287b2f25f3b5ae4c27f4748694563ee._comment
new file mode 100644
index 000000000..e108052d7
--- /dev/null
+++ b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_3_3287b2f25f3b5ae4c27f4748694563ee._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 3"
+ date="2013-03-03T18:53:23Z"
+ content="""
+Are you sure the file in question is checked into git? Because git-annex ignores symlinks that are not checked into git.
+"""]]
diff --git a/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_4_e515eca68a70d40c522805d7e0d7c0e6._comment b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_4_e515eca68a70d40c522805d7e0d7c0e6._comment
new file mode 100644
index 000000000..4a533fc92
--- /dev/null
+++ b/doc/bugs/__39__client__39___repo_starts_pulling_in___39__archive__39___content/comment_4_e515eca68a70d40c522805d7e0d7c0e6._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="http://edheil.wordpress.com/"
+ ip="99.54.57.201"
+ subject="comment 4"
+ date="2013-03-03T18:58:42Z"
+ content="""
+Just to see what happened, I re-added that same file in another directory manually (not with the assistant).
+
+git annex whereis instantly showed that it was in all the other repositories.
+
+I finally thought to try a \"git status\" -- it showed that with for the original copy of this I added, the actual symlink was never checked into git.
+
+    annex$ git status
+    # On branch master
+    # Untracked files:
+    #   (use \"git add <file>...\" to include in what will be committed)
+    #
+    #	Movies/Music/Tanlines - All Of Me.flv
+    nothing added to commit but untracked files present (use \"git add\" to track)
+    annex$ 
+
+This is probably all unrelated to the original topic of the bug -- I am not seeing the \"client repo starts pulling in archive content, dropping it from backup remote\" issue anymore.
+
+"""]]