diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
| commit | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (patch) | |
| tree | b6097608e2e12c026ca05164fc81148ede79cc23 /doc/design/adjusted_branches.mdwn | |
| parent | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (diff) | |
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
Diffstat (limited to 'doc/design/adjusted_branches.mdwn')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 6b69306a9..e94439d66 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -279,37 +279,6 @@ into adjusted view worktrees.] will make copies of the content of annexed files, so this would need to checkout the adjusted branch some other way. Maybe generalize so this more efficient checkout is available as a git-annex command? -* sync in adjusted branch runs merge in overlay worktree, - but the merge conflict resolution code does not know to use that - worktree. -* sync in adjusted branch can trigger merge conflict detection where - there should be no conflict. - - git init a - cd a - git annex init --version=6 - echo hi > f - git annex add f - git annex sync - cd .. - - git clone a b - cd b - git annex init --version=6 - git annex get - git annex adjust --unlock - cd .. - - cd a - git mv f f2 - git annex sync - cd .. - - cd b - git annex sync - - To fix, implement "avoiding conflicted merge" above. - * There are potentially races in code that assumes a branch like master is not being changed by someone else. In particular, propigateAdjustedCommits rebases the adjusted branch on top of master. |