Merge remote-tracking branch 'branchable/master'

2 files changed, 20 insertions, 1 deletions

diff --git a/doc/bugs/softlink_atime.mdwn b/doc/bugs/softlink_atime.mdwn
index 69d6f6600..c62610be0 100644
--- a/doc/bugs/softlink_atime.mdwn
+++ b/doc/bugs/softlink_atime.mdwn
@@ -41,8 +41,8 @@ Optionally, editing the meta-data should change the times in all annexes.
 >>>>>>> This is even better:
 
     #!/bin/sh
+    if ! type metastore >/dev/null; then echo "$0: metastore is not installed; exiting"; exit 1; fi
     git annex pre-commit .
-    which metastore || echo "$0: metastore is not installed; exiting"; exit 99
     metastore --save
     git add .metadata
 
diff --git a/doc/walkthrough/moving_file_content_between_repositories/comment_1_4c30ade91fc7113a95960aa3bd1d5427._comment b/doc/walkthrough/moving_file_content_between_repositories/comment_1_4c30ade91fc7113a95960aa3bd1d5427._comment
new file mode 100644
index 000000000..b3dc8fe7a
--- /dev/null
+++ b/doc/walkthrough/moving_file_content_between_repositories/comment_1_4c30ade91fc7113a95960aa3bd1d5427._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
+ nickname="Richard"
+ subject="comment 1"
+ date="2011-03-22T23:41:51Z"
+ content="""
+I may be missing something obvious, but when I copy to a remote repository, the object files are created, but no softlinks are created. When I pull everything from the remote, it pulls only files the local repo knows about already.
+
+        A
+       / \
+      B   C
+
+Moving from B to A creates no symlinks in A but the object files are moved to A. Copying back from A to B restores the object files in B and keeps them in A.
+
+Copying from A to an empty C does not create any object files nor symlinks. Copying from C to A creates no symlinks in A but the object files are copied to A.
+
+-- RichiH
+
+"""]]