summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 15:47:37 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 15:47:37 -0400
commit00f62c5298ee12b9efcea2b113eed3098cbcc7a7 (patch)
treed661f4a0dd19f3c07c4b7268f97f14d92e157f66
parentca86e8cd19e3153782f44da6b66468bf2208c12a (diff)
merge
-rw-r--r--doc/bugs/indeterminite_preferred_content_state_for_duplicated_file.mdwn3
-rw-r--r--doc/bugs/preferred_content_and_deduplication.mdwn5
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/indeterminite_preferred_content_state_for_duplicated_file.mdwn b/doc/bugs/indeterminite_preferred_content_state_for_duplicated_file.mdwn
index 4f516a61c..a297a7af0 100644
--- a/doc/bugs/indeterminite_preferred_content_state_for_duplicated_file.mdwn
+++ b/doc/bugs/indeterminite_preferred_content_state_for_duplicated_file.mdwn
@@ -13,3 +13,6 @@ Such a map exists, in the keys database, but only in v6 mode repositories.
So, this seems solvable in v6 repositories, but not in v5.
Also, the associated files map may not be accurate at all times, so that's
a wrinkle to using it for this. --[[Joey]]
+
+(See [[bugs/preferred_content_and_deduplication]] for a user bug report of
+the same thing, with some suggestions for workarounds too.)
diff --git a/doc/bugs/preferred_content_and_deduplication.mdwn b/doc/bugs/preferred_content_and_deduplication.mdwn
index e9244c4bf..fbd4aad7a 100644
--- a/doc/bugs/preferred_content_and_deduplication.mdwn
+++ b/doc/bugs/preferred_content_and_deduplication.mdwn
@@ -96,3 +96,8 @@ Linux lenard-hp 4.6.0-1-amd64 #1 SMP Debian 4.6.4-1 (2016-07-18) x86_64 GNU/Linu
I'm just trying out git-annex and I like it so far. I'm using it to keep my personal photos on my home server.
+> There's already a bug report open about this:
+> [[bugs/indeterminite_preferred_content_state_for_duplicated_file]].
+>
+> Closing as a duplicate, but thanks for a well-researched bug report.
+> [[done]] --[[Joey]]