diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-31 18:56:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-31 18:56:30 -0400 |
| commit | dc6d60cb3cbeed45e0651818f762445812f84e7a (patch) | |
| tree | 5cdd00126507e2cae36e0fd1a75fa285c802528e /doc | |
| parent | ddea6cd8a220cb3327b457714a9d52f2b9fe5de5 (diff) | |
remove old bug
I just fixed this one today; it was not the problem I thought it was.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index f790469c8..a4fd40650 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -358,25 +358,3 @@ into adjusted view worktrees.] have already been handled by updateAdjustedBranch. But, if another remote 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. - ------- - -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 - ------- - - |