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

improve propigation of commits from adjusted branches

Browse source 
Only reverse adjust the changes in the commit, which means that adjustments
do not need to be generally cleanly reversable.

For example, an adjustment can unlock all locked files, but does not need
to worry about files that were originally unlocked when reversing, because
it will only ever be run on files that have been changed. So, it's ok
if it locks all files when reversed, or even leaves all files as-is when
reversed.
This commit is contained in:
Joey Hess 2016-03-11 16:00:14 -04:00
parent 3c4ad3eeca
commit b9184f69a7
Failed to extract signature
4 changed files with 110 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/design/adjusted_branches.mdwn
View file

@ -67,7 +67,7 @@ and updates the branches. And/or `git-annex sync` could do it.
There may be multiple commits made to the adjusted branch before any get
applied back to the original branch. This is handled by reverse filtering
one at a time and rebasing the others on top.
commits one at a time and rebasing the others on top.
master adjusted/master
A