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

remove old bug

Browse source 
I just fixed this one today; it was not the problem I thought it was.
This commit is contained in:
Joey Hess 2016-03-31 18:56:30 -04:00
parent 12ddb6e8b2
commit b7d7cc858e
Failed to extract signature
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
doc/design/adjusted_branches.mdwn
View file

@ -358,25 +358,3 @@ into adjusted view worktrees.]
have already been handled by updateAdjustedBranch. But, if another remote have already been handled by updateAdjustedBranch. But, if another remote
pushed a new master at just the right time, the adjusted branch could be pushed a new master at just the right time, the adjusted branch could be
rebased on top of a master that it doesn't incorporate, which is wrong. rebased on top of a master that it doesn't incorporate, which is wrong.
------
TODO 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
------