From c9ac7aa338b6e7aa3645eedf738023967d30a80b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Mar 2020 15:18:47 -0400 Subject: [PATCH] patch applied --- CHANGELOG | 7 +++++-- ...does_not_propagate_changed_submodule_commit.mdwn | 1 + ...ment_2_e37aaf6d440b6c2a7567b3df1c344ff7._comment | 13 +++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 doc/bugs/Sync_of_adjusted_branch_does_not_propagate_changed_submodule_commit/comment_2_e37aaf6d440b6c2a7567b3df1c344ff7._comment diff --git a/CHANGELOG b/CHANGELOG index 2597424c00..cc1195c4cd 100644 --- 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 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 3a1aae1fc1..625d4c64da 100644 --- 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 index 0000000000..f17dd818ff --- /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. +"""]]