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

6 files changed, 195 insertions, 0 deletions

diff --git a/doc/bugs/__96__git_annex_import__96___does_not_work_on_other_git_annex_repositories/comment_2_befde3ef3d2b171ebb691915ff3af172._comment b/doc/bugs/__96__git_annex_import__96___does_not_work_on_other_git_annex_repositories/comment_2_befde3ef3d2b171ebb691915ff3af172._comment
new file mode 100644
index 000000000..9996882fc
--- /dev/null
+++ b/doc/bugs/__96__git_annex_import__96___does_not_work_on_other_git_annex_repositories/comment_2_befde3ef3d2b171ebb691915ff3af172._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://id.koumbit.net/anarcat"
+ ip="72.0.72.144"
+ subject="it's worse than not working, it kills! :)"
+ date="2013-10-07T12:06:22Z"
+ content="""
+so yeah, it doesn't really work well, and maybe that is to be expected because of symlinks, but it's much worse than that: the original git annex repo will actually be destroyed because git annex import will [[trash the .git metadata directory|bugs/git_annex_import_destroys_a_fellow_git_annex_repository]]. Recovering from that is... interesting, to say the least. :)
+"""]]
diff --git a/doc/bugs/git_annex_import_destroys_a_fellow_git_annex_repository.mdwn b/doc/bugs/git_annex_import_destroys_a_fellow_git_annex_repository.mdwn
new file mode 100644
index 000000000..ffc4bcc1d
--- /dev/null
+++ b/doc/bugs/git_annex_import_destroys_a_fellow_git_annex_repository.mdwn
@@ -0,0 +1,126 @@
+### Please describe the problem.
+
+`git annex import` not only [[does not work with git annex repositories|bugs/`git annex import` does not work on other git annex repositories]], it even destroys the meta-data in that repository, because it moves the `.git/*` metadata out of the remote repository.
+
+### What steps will reproduce the problem?
+
+[[!format txt """
+git init foo
+cd foo
+git annex init
+dd if=/dev/urandom of=foo bs=1M count=1
+git annex add foo
+git commit -m'files'
+cd ../
+git init bar
+cd bar
+git annex init
+mkdir foo
+cd foo
+git annex import ../../foo
+cd ../../foo
+git status
+"""]]
+
+
+### What version of git-annex are you using? On what operating system?
+
+[[!format txt """
+anarcat@angela:foo$ git annex version
+git-annex version: 4.20130921-g434dc22
+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP DNS Feeds Quvi
+"""]]
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+anarcat@angela:~$ cd /tmp
+anarcat@angela:/tmp$ mkdir test
+anarcat@angela:/tmp$ cd test
+anarcat@angela:test$ ls
+anarcat@angela:test$ git init foo
+Initialized empty Git repository in /tmp/test/foo/.git/
+anarcat@angela:test$ cd foo
+anarcat@angela:foo$ git annex init
+init  ok
+(Recording state in git...)
+anarcat@angela:foo$ dd if=/dev/urandom of=foo bs=1M count=1
+1+0 enregistrements lus
+1+0 enregistrements écrits
+1048576 octets (1,0 MB) copiés, 0,410384 s, 2,6 MB/s
+anarcat@angela:foo$ git annex add foo
+add foo (checksum...) ok
+(Recording state in git...)
+anarcat@angela:foo$ git commit -m'files'
+[master (root-commit) 83daa0b] files
+ 1 file changed, 1 insertion(+)
+ create mode 120000 foo
+anarcat@angela:foo$ cd ../
+anarcat@angela:test$ git init bar
+Initialized empty Git repository in /tmp/test/bar/.git/
+anarcat@angela:test$ cd bar
+anarcat@angela:bar$ git annex init
+init  ok
+(Recording state in git...)
+anarcat@angela:bar$ mkdir foo
+anarcat@angela:bar$ cd foo
+anarcat@angela:foo$ git annex import ../../foo
+import .git/COMMIT_EDITMSG (checksum...) ok
+import .git/description (checksum...) ok
+import .git/config (checksum...) ok
+import .git/index (checksum...) ok
+import .git/HEAD (checksum...) ok
+import .git/annex/journal.lck (checksum...) ok
+import .git/annex/index.lck (checksum...) ok
+import .git/annex/sentinal (checksum...) ok
+import .git/annex/sentinal.cache (checksum...) ok
+import .git/annex/index (checksum...) ok
+import .git/annex/objects/w2/Kz/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b
+git-annex: ../../foo/.git/annex/objects/w2/Kz/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b/SHA256E-s1048576--f957108785c8dc30cf792948b89d61af257c40e5ef0e1d20ff6cf6aadaf6f66b: rename: permission denied (Permission denied)
+failed
+import .git/objects/0e/6881452189b7fc34809f101f075da7cca9d9d8 (checksum...) ok
+import .git/objects/03/c0163611cd061af17b2dd58a93c95ffbb05040 (checksum...) ok
+import .git/objects/39/10912eab082d015bface04ed3a8ed658b94893 (checksum...) ok
+import .git/objects/21/05f6aaf523510f25516b04a0c07d5900df2b0b (checksum...) ok
+import .git/objects/83/daa0b1d8290191f53d1d3b5e39e03653a89ce2 (checksum...) ok
+import .git/objects/83/8fa78626a6cdc4399186172df9109d321ca0bf (checksum...) ok
+import .git/objects/dc/1e1b7b811079e1c5826d44958b736fc3a3a458 (checksum...) ok
+import .git/objects/7b/4d3d6a3ee2286b2da15c1aca39353d63c16fa2 (checksum...) ok
+import .git/objects/86/2b2a09ebc7a1eb298dccc57be75bad897a7c10 (checksum...) ok
+import .git/objects/e1/61ad2ad1843e39937caaf6add6f690fd361126 (checksum...) ok
+import .git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 (checksum...) ok
+import .git/objects/9b/47feee99b5f24e0dc96cf4a20fcb88c0ec007d (checksum...) ok
+import .git/objects/b0/8c838cfb09bafae40a05312092c37360c880b0 (checksum...) ok
+import .git/refs/heads/master (checksum...) ok
+import .git/refs/heads/git-annex (checksum...) ok
+import .git/logs/HEAD (checksum...) ok
+import .git/logs/refs/heads/master (checksum...) ok
+import .git/logs/refs/heads/git-annex (checksum...) ok
+import .git/info/exclude (checksum...) ok
+import .git/hooks/pre-applypatch.sample (checksum...) ok
+import .git/hooks/applypatch-msg.sample (checksum...) ok
+import .git/hooks/pre-rebase.sample (checksum...) ok
+import .git/hooks/update.sample (checksum...) ok
+import .git/hooks/commit-msg.sample (checksum...) ok
+import .git/hooks/pre-commit (checksum...) ok
+import .git/hooks/prepare-commit-msg.sample (checksum...) ok
+import .git/hooks/post-update.sample (checksum...) ok
+import .git/hooks/pre-commit.sample (checksum...) ok
+(Recording state in git...)
+error: Invalid path 'foo/.git/COMMIT_EDITMSG'
+error: unable to add foo/.git/COMMIT_EDITMSG to index
+fatal: adding files failed
+
+git-annex: user error (xargs ["-0","git","--git-dir=/tmp/test/bar/.git","--work-tree=/tmp/test/bar","add","--"] exited 123)
+failed
+git-annex: import: 2 failed
+anarcat@angela:foo$ cd ../../foo
+anarcat@angela:foo$ git status
+fatal: Not a git repository (or any of the parent directories): .git
+anarcat@angela:foo$
+# End of transcript or log.
+"""]]
+
+Thanks! --[[anarcat]]
diff --git a/doc/devblog/day_27__locking_fun/comment_3_b67f8ef4ed42b49c8c2e6c4e53163b16._comment b/doc/devblog/day_27__locking_fun/comment_3_b67f8ef4ed42b49c8c2e6c4e53163b16._comment
new file mode 100644
index 000000000..39c840e84
--- /dev/null
+++ b/doc/devblog/day_27__locking_fun/comment_3_b67f8ef4ed42b49c8c2e6c4e53163b16._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm5iosFbL2By7UFeViqkc6v-hoAtqILeDA"
+ nickname="Laszlo"
+ subject="comment 3"
+ date="2013-10-07T09:17:30Z"
+ content="""
+Hi,
+
+Can you please enlighten us mere mortals, when this stale file locking problem occcurs?
+The typical situation. I tried to google up, and read locking files on wikipedia, but 
+still have no exact knowledge when the \"stale\" part happens.
+
+How it gets outdated without noticing?
+
+Best, 
+ Laszlo
+
+"""]]
diff --git a/doc/tips/centralized_git_repository_tutorial/comment_1_9072ebc0c61446d7b151fcfab616fea9._comment b/doc/tips/centralized_git_repository_tutorial/comment_1_9072ebc0c61446d7b151fcfab616fea9._comment
new file mode 100644
index 000000000..c509d7579
--- /dev/null
+++ b/doc/tips/centralized_git_repository_tutorial/comment_1_9072ebc0c61446d7b151fcfab616fea9._comment
@@ -0,0 +1,33 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkC0W3ZQERUaTkHoks6k68Tsp1tz510nGo"
+ nickname="Georg"
+ subject="sync, push, pull with/to/from centralized bare repository"
+ date="2013-10-07T06:45:19Z"
+ content="""
+Hi Joey,
+
+thanks for tutorial with the centralized repo. I am currently trying to set up a central bare repo for two clients (they cannot communicate directly with each other). I am not sure if I am pushing/pulling the right way.
+
+On the server I did:
+
+    git init --bare
+    git annex init origin
+
+On Cĺient Alice (I want to give Bob a chance get call \"git annex get\" from \"origin\"):
+
+    git clone ssh://tktest@192.168.56.104/~/annex .
+    git annex init Alice
+    git annex merge
+    git annex add .
+    git commit -a -m \"Added tutorial\"
+    git push origin master git-annex
+    git annex copy . --to origin
+
+On Client Bob I have called \"clone, init, merge, add, push, copy\" also.
+
+Now the tricky part - do I have to call \"git annex sync\" at Alice's side to get the updates from Bob over origin?
+I ran into troubles if I called \"copy --to origin\" before \"git push origin master git-annex\". How can I resolve a non-fast-forware on the git-annex branch?
+Some notes about how to sync over a central bare repo would be nice here =)
+
+Thanks a lot, Georg
+"""]]
diff --git a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
index 42761b5b9..7bddd64b9 100644
--- a/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
+++ b/doc/tips/migrating_two_seperate_disconnected_directories_to_git_annex.mdwn
@@ -59,6 +59,8 @@ Say that some files on `angela` are actually spread out outside of the `~/mp3` d
     cd ~/mp3
     git annex import ~/music/
 
+(!) Be careful that `~/music` is not a git-annex repository, or this will [[destroy it!|bugs/git annex import destroys a fellow git annex repository]].
+
 Deleting deleted files
 ----------------------
 
diff --git a/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment b/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment
new file mode 100644
index 000000000..e6acad3b9
--- /dev/null
+++ b/doc/todo/wishlist:_unify_directory_scheme_for_the_store/comment_3_e555d0dbbaa05528806905c6a940724b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w"
+ nickname="Rafaël"
+ subject="comment 3"
+ date="2013-10-07T13:33:40Z"
+ content="""
+By the way, I just had the case above, i.e. convert a bare repo to non-bare. In order to keep the annex files, I cloned the bare one, and git-annex move'ed all annex content to the new repo, and to my surprise it was slow, as if all files where copied (or maybe they were only checksummed?), instead of being only renamed (old and new repos were on the same partition). So I restate that at least a command line tool giving the prefix dirs would be useful, to allow scripting for this kind of situation.
+"""]]