summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-09-29 13:37:11 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-29 13:37:11 -0400
commit9454f2c240ebf0e72b711fa852027b5fad4ffa33 (patch)
tree13d66b1d4d61b22935fa305280a9270589900300
parent4d6f7038b86ebb6c583b8881c2ff47722a32f95f (diff)
parent6d496abe10b52712d122c68fcb6bde028bb8aeb8 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/forum/uuid_mismatch___59___expected_Just___40__UUID_...___41___but_remote_gitrepo_has_UUID_....mdwn17
-rw-r--r--doc/tips/using_gitolite_with_git-annex/comment_24_a62f59295b3912dc38def5e493bdb55a._comment23
2 files changed, 40 insertions, 0 deletions
diff --git a/doc/forum/uuid_mismatch___59___expected_Just___40__UUID_...___41___but_remote_gitrepo_has_UUID_....mdwn b/doc/forum/uuid_mismatch___59___expected_Just___40__UUID_...___41___but_remote_gitrepo_has_UUID_....mdwn
new file mode 100644
index 000000000..2d1626e38
--- /dev/null
+++ b/doc/forum/uuid_mismatch___59___expected_Just___40__UUID_...___41___but_remote_gitrepo_has_UUID_....mdwn
@@ -0,0 +1,17 @@
+Hi,
+
+After reinstalling my laptop with the same GPG keys, I've got this error during re-syncing a remote crypted repo :
+
+```
+Internal Server Error
+; expected Just (UUID "e7fc2bc8-b630-5eeb-a0b3-b4806d7ab064") but remote gitrepo has UUID "e2f02805-eae7-5bb8-875e-c901ba9929b1" (":id:SCPxErEQVlqp+Hl6Su0f")
+```
+
+Then, I can see the structure of the hard links in the local directory but pointing to nothing ?
+
+FYI all sub directories in .git/annex/objects contain .map files only.
+
+Could you please help me ?
+Those data are critical, thanks for your great app and your help!
+
+Guillaume
diff --git a/doc/tips/using_gitolite_with_git-annex/comment_24_a62f59295b3912dc38def5e493bdb55a._comment b/doc/tips/using_gitolite_with_git-annex/comment_24_a62f59295b3912dc38def5e493bdb55a._comment
new file mode 100644
index 000000000..c6e4c02f1
--- /dev/null
+++ b/doc/tips/using_gitolite_with_git-annex/comment_24_a62f59295b3912dc38def5e493bdb55a._comment
@@ -0,0 +1,23 @@
+[[!comment format=mdwn
+ username="git-annex@5b470e1f6ed6d30997d729f0a8b1c841dea886f1"
+ nickname="git-annex"
+ subject="Using gitolite 3.6.6 mirror not working with annex"
+ date="2016-09-28T18:12:56Z"
+ content="""
+I find out that I need to add the following lines to the gitolite.rc
+in the server side.
+
+'git-annex-shell ua'
+
+The signal repository works with gitolite as expected.
+However, the mirroring feature is not working for slaves.
+When I do
+
+git annex copy --to origin
+
+The master server store the annex file correctly.
+The file managed by annex is not syncing to the slave
+mirrors at all.
+
+
+"""]]