aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-01 11:57:51 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-01 11:57:51 -0400
commitbdefd925cb52efb97849695a94bd8409acf2e3df (patch)
treebb528373489e68d875afe3687f87d50ab30a8693
parent79f4e768e98d28a74ba511161282137aaa367f16 (diff)
parent5175a95f817a5cdd0d643b60be9a5eca6b995534 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/backends/comment_6_82f239b58680a2681bd8074c7ef9584d._comment8
-rw-r--r--doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment11
2 files changed, 19 insertions, 0 deletions
diff --git a/doc/backends/comment_6_82f239b58680a2681bd8074c7ef9584d._comment b/doc/backends/comment_6_82f239b58680a2681bd8074c7ef9584d._comment
new file mode 100644
index 000000000..cbd4682ab
--- /dev/null
+++ b/doc/backends/comment_6_82f239b58680a2681bd8074c7ef9584d._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.47"
+ subject="comment 6"
+ date="2013-11-01T15:47:26Z"
+ content="""
+Some examples of problems with the raw SHA backends include, IIRC, calibre, and many programs on OSX. These programs look at the extension of the filename the symlink points at.
+"""]]
diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment
new file mode 100644
index 000000000..0e5d67f74
--- /dev/null
+++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_5_39eb0bb96fd271bd0de4a3a40814ae1b._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.47"
+ subject="comment 5"
+ date="2013-11-01T15:48:21Z"
+ content="""
+AFAIK this bug is fixed, which is why I wrote above, \"Bug fixed; test case added; done\"
+
+If you have reason to think otherwise, better follow up.
+
+"""]]