merged fix from kyle

diff --git a/CHANGELOG b/CHANGELOG
index d7992f8c917c0eb2de43f20af391d49d6a22da50..2d5a7f545200c83c1f1613aabafa794cb1ee1822 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,9 @@ git-annex (8.20201130) UNRELEASED; urgency=medium
     be used.
   * Fix --time-limit, which got broken in several ways by some optimisations
     in version 8.20201007.
+  * When syncing changes back from an adjusted branch to the basis branch,
+    include deletions of submodules.
+    Thanks, Kyle Meyer for the patch.
 
  -- Joey Hess <id@joeyh.name>  Mon, 04 Jan 2021 12:52:41 -0400
 

diff --git a/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch.mdwn b/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch.mdwn
index 31dda72e2a7bdf334b5e118332e5a6fe5c50289b..4c47a35a4cac7d1774ba380541534e729feb841b 100644 (file)
--- a/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch.mdwn
+++ b/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch.mdwn
@@ -121,3 +121,4 @@ base-commit: f3546976483aa4c29e1050081af6d5a03290e25b
 [[!meta author=kyle]]
 [[!tag projects/datalad]]
 
+> [[done]] thanks! --[[Joey]]

diff --git a/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch/comment_1_6473d7eceae5141e36c87156044b9d06._comment b/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch/comment_1_6473d7eceae5141e36c87156044b9d06._comment
new file mode 100644 (file)
index 0000000..9519541
--- /dev/null
+++ b/doc/bugs/Submodule_deletion_not_synced_from_adjusted_branch/comment_1_6473d7eceae5141e36c87156044b9d06._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2021-01-07T17:41:49Z"
+ content="""
+Clearly correct. The `_` pattern match hid this when
+[[!commit a13c0ce66c]] added TreeCommit.
+"""]]