merge

diff --git a/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck.mdwn b/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck.mdwn
index a9ed43785d9701b3378830f8d0095a95079cad37..b59b724aa5ef4f67dc4137c977e21cebab3e3761 100644 (file)
--- a/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck.mdwn
+++ b/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck.mdwn
@@ -59,3 +59,7 @@ Unpacking objects: 100% (334784/334784), done.
 
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 I use it for everything, around 3TB of data at the moment. It is awesome.
+
+> [[fixed|done]], although the root cause of the problem is
+> [[git_fsck_duplicateEntries_errors_when_using_adjusted_branch]]
+> --[[Joey]]

diff --git a/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck/comment_3_14509fcbd4305808c32c79c3b8d36e80._comment b/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck/comment_3_14509fcbd4305808c32c79c3b8d36e80._comment
new file mode 100644 (file)
index 0000000..8b4d0e6
--- /dev/null
+++ b/doc/bugs/git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck/comment_3_14509fcbd4305808c32c79c3b8d36e80._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 3"""
+ date="2021-01-29T19:14:53Z"
+ content="""
+hmm, so tree 3818a8ea201197ed355aa87133a718afca7c4a49 has 2 Dokument
+entries. Interesting.
+
+If you still have that repo, it would be interesting to compare trees
+cd854aba649cee8855ec72579f4c98100471f7cf and 1ae499997746c8e976cf02edc2276532978dafc5
+
+[[git_fsck_duplicateEntries_errors_when_using_adjusted_branch]] dates
+from 2018, so I think I was right about my guess that it was something
+about adjusted branches that led to this. I'll merge this bug into that
+one.
+"""]]

diff --git a/doc/bugs/git_fsck_duplicateEntries_errors_when_using_adjusted_branch/comment_6_cfefa7ac1f538566ee028aa3996e22cd._comment b/doc/bugs/git_fsck_duplicateEntries_errors_when_using_adjusted_branch/comment_6_cfefa7ac1f538566ee028aa3996e22cd._comment
new file mode 100644 (file)
index 0000000..f432896
--- /dev/null
+++ b/doc/bugs/git_fsck_duplicateEntries_errors_when_using_adjusted_branch/comment_6_cfefa7ac1f538566ee028aa3996e22cd._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 6"""
+ date="2021-01-29T19:23:19Z"
+ content="""
+An older bug [[git-annex_wants_to_repair_because_of_duplicateEntries_in_git_fsck]]
+also had duplicate directory entries. I'm not clear if adjusted branches
+were involved there.
+
+I can't reproduce it using that script that was working to reproduce it for
+a while for me.
+"""]]