From 0f36cd16136d65511a45707484536253b7b2a821 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Aug 2025 13:36:39 -0400 Subject: [PATCH] fixed --- doc/bugs/Re-Adjust_Loses_Commits.mdwn | 2 ++ ...omment_3_80f036b355f445776232fe4b104790f1._comment | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment diff --git a/doc/bugs/Re-Adjust_Loses_Commits.mdwn b/doc/bugs/Re-Adjust_Loses_Commits.mdwn index bc0f236553..c3c75089c5 100644 --- a/doc/bugs/Re-Adjust_Loses_Commits.mdwn +++ b/doc/bugs/Re-Adjust_Loses_Commits.mdwn @@ -78,3 +78,5 @@ Git-annex is such a great piece of software, thanks for creating it. I use it to But now I started using some SW that cannot deal with symlinks, so I use an adjusted branch of main. Merging the new import branch into the adjusted branch leads to the described issue. Many thanks and have a great day! + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment b/doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment new file mode 100644 index 0000000000..7f75ec9550 --- /dev/null +++ b/doc/bugs/Re-Adjust_Loses_Commits/comment_3_80f036b355f445776232fe4b104790f1._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2025-08-20T17:08:24Z" + content=""" +I've made `git-annex sync` and also `git-annex adjust` error out in this +situation, rather than treating it as a warning. + +I also improved the error message a bit. And improved the documentation +to warn against getting into this situation. +"""]] -- 2.30.2