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

5 files changed, 43 insertions, 0 deletions

diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies.mdwn b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies.mdwn
new file mode 100644
index 000000000..9cc0c031c
--- /dev/null
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies.mdwn
@@ -0,0 +1,11 @@
+I added new content to my git annex repo on my laptop, in the usual way: copying the new dir into the repo, then cd into the new directory, 'git annex add .' and then 'git commit -m <MSG>'. Everything went well, with no errors, which means that the files were correctly moved to .git/annex/objects/ and symbolic links were created in the new dir. But now, if I do 'git annex fsck .', I get an error for each file:
+[[!format sh """
+fsck <FILENAME> (fixing location log) (checksum...)
+
+  ** No known copies exist of <FILENAME>
+failed
+"""]]
+Unfortunately, I am not able to reproduce the problem on a toy-example repository. This means that my git annex repo may be broken. How do I fix it?
+I use git v1.9.1 on Ubuntu 14.04 LTS, and git-annex version: 5.20150406-gb2814bc
+
+OK, in all honesty, I did a 'git annex sync' between the 'add' and the 'commit' above. But I synced with a clone of the repository that I keep on an external drive, which is less updated than my laptop. It is less updated because I always add content on my laptop and then sync/get from the external disk. So the sync did no harm, apparently.
diff --git a/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment
new file mode 100644
index 000000000..c059040e1
--- /dev/null
+++ b/doc/bugs/after_git_annex_add_and_commit__44___git_annex_fsck_fails:_no_known_copies/comment_1_b23c42004a3486d2409c1f96afa819aa._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="emanuele.olivetti@47d88ed185b03191e25329caa6fabc2efb3118b2"
+ nickname="emanuele.olivetti"
+ subject="comment 1"
+ date="2016-02-13T22:27:56Z"
+ content="""
+Additional information: I have 62 files in the added directory. Git-annex info return this, with a suspicious \"numcopies -2: 62\":
+
+    > git-annex info .
+    directory: .
+    local annex keys: 62
+    local annex size: 377.19 megabytes
+    annexed files in working tree: 62
+    size of annexed files in working tree: 377.19 megabytes
+    numcopies stats: 
+        	numcopies -2: 62
+
+"""]]
diff --git a/doc/bugs/annex_symlinks_too.mdwn b/doc/bugs/annex_symlinks_too.mdwn
new file mode 100644
index 000000000..baac67485
--- /dev/null
+++ b/doc/bugs/annex_symlinks_too.mdwn
@@ -0,0 +1,6 @@
+Hi,
+
+Because git annex doesn't annex symlinks, it is not possible to copy files from the a repository with a simple cp/rsync dereferencing each files. If we do this as of today, we would lose the original symlink information.
+Would it be possible to change this behavior in the future, at least with an option?
+
+Thanks
diff --git a/doc/forum/The_future_of_Direct_Mode/comment_2_c7408d45d0a2a854020e4169fe757d51._comment b/doc/forum/The_future_of_Direct_Mode/comment_2_c7408d45d0a2a854020e4169fe757d51._comment
new file mode 100644
index 000000000..e0448a961
--- /dev/null
+++ b/doc/forum/The_future_of_Direct_Mode/comment_2_c7408d45d0a2a854020e4169fe757d51._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="Gus"
+ subject="Thanks"
+ date="2016-02-12T21:47:53Z"
+ content="""
+Thank you for your help.
+"""]]
diff --git a/doc/todo/metadata_--batch.mdwn b/doc/todo/metadata_--batch.mdwn
new file mode 100644
index 000000000..2680dfd2b
--- /dev/null
+++ b/doc/todo/metadata_--batch.mdwn
@@ -0,0 +1 @@
+[[!meta author=yoh]]