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

note a bug

Browse source
This commit is contained in:
Joey Hess 2016-02-29 17:30:37 -04:00
parent 70e78cc53e
commit 70e65db751
Failed to extract signature
1 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
doc/design/adjusted_branches.mdwn
View file

@ -139,6 +139,28 @@ conflict should only affect the work tree/index, so can be resolved without
making a commit, but B'' may end up being made to resolve a merge making a commit, but B'' may end up being made to resolve a merge
conflict.) conflict.)
------
FIXME: When an adjusted unlocked branch has gotten a file, and a new
commit is merged in, that does not touch that file, there is a false merge
conflict on the file. It's auto-resolved by creating a .variant file.
This is probably a bug in the auto-resolve code for v6 files.
Test case:
git clone ~/lib/tmp
cd tmp
git annex upgrade
git annex adjust
git annex get t/foo
# make change in ~/lib/tmp and commit
git annex sync
# t/foo.variant-* is there
------
Once the merge is done, we have a commit B'' on adjusted/master. To finish, Once the merge is done, we have a commit B'' on adjusted/master. To finish,
adjust that commit so it does not have adjusted/master as its parent. adjust that commit so it does not have adjusted/master as its parent.