From aa5de5e25c46cbf5c0eb2cd6e0fb6e84be5586fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Mar 2016 11:31:26 -0400 Subject: thought on reversing commits to adjusted branch --- doc/design/adjusted_branches.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index ba3e78421..f79a7f1ab 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -209,6 +209,12 @@ which to not delete when reversing it? So, a reverse filter may need some state that was collected when running the filter forwards, in order to decide what to do. +Alternatively, instead of reverse filtering the whole adjusted tree, +look at just the new commit that's being propigated back from the +adjusted to master branch. Get the diff from it to the previous +commit; the changes that were made. Then de-adjust those changes, +and apply the changes to the master branch. + ## push The new master branch can then be pushed out to remotes. The -- cgit v1.2.3