patch applied

diff --git a/CHANGELOG b/CHANGELOG
index 2597424c00cf0373a4680fa6fb0323a3dee3e892..cc1195c4cdcc09a4fcd058754d5c5ac10802088a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,9 +8,12 @@ git-annex (8.20200310) UNRELEASED; urgency=medium
     multiple times to git.
   * add --force-small: Fix a bug that, when adding a symbolic link,
     checked in the content of the file the symlink pointed to.
-    Thanks, Kyle Meyer for noticing and for the patch.
+    Thanks, Kyle Meyer for the patch.
   * add --force-small: Fix failure when passed a modified submodule.
-    Thanks, Kyle Meyer for noticing and for the patch.
+    Thanks, Kyle Meyer for the patch.
+  * When syncing changes back from an adjusted branch to the basis branch,
+    include changes to submodules.
+    Thanks, Kyle Meyer for the patch.
 
  -- Joey Hess <id@joeyh.name>  Mon, 16 Mar 2020 12:43:33 -0400
 

diff --git a/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit.mdwn b/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit.mdwn
index 3a1aae1fc100e191e439c99d41bbaf88311f0bb0..625d4c64dafb5a905509e38c06ffa85c0083396e 100644 (file)
--- a/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit.mdwn
+++ b/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit.mdwn
@@ -91,3 +91,4 @@ index da05a3fa5..9627ae969 100644
 [[!meta author=kyle]]
 [[!tag projects/datalad]]
 
+> [[applied|done]], thanks! --[[Joey]]

diff --git a/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit/comment_2_e37aaf6d440b6c2a7567b3df1c344ff7._comment b/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit/comment_2_e37aaf6d440b6c2a7567b3df1c344ff7._comment
new file mode 100644 (file)
index 0000000..f17dd81
--- /dev/null
+++ b/doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit/comment_2_e37aaf6d440b6c2a7567b3df1c344ff7._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2020-03-26T18:53:05Z"
+ content="""
+Ok, figured it out.. reverseAdjustedTree uses a `propchanges`
+function that looks at the diff from adjusted branch to basis,
+and substitutes the new sha for the old one. So that's
+how the sha get changed.
+
+My analysis was otherwise correct, I think. And your patch is fine, now
+that I understand that. Applying it as-is.
+"""]]