mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

thought on reversing commits to adjusted branch

Browse source
This commit is contained in:
Joey Hess 2016-03-04 11:31:26 -04:00
parent f49570857c
commit 5716c39928
Failed to extract signature
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/design/adjusted_branches.mdwn
View file

@ -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