Mercurial > hg
comparison tests/test-rename-merge2.t @ 23397:c7c95838be9a
merge: break out "both renamed a -> b" case
We can further limit the scope of the 2-way merge case by breaking out
the case where the file was not created from scratch on both sides but
rather renamed in the same way (and is therefore a 3-way merge). This
involves copying some code, but it makes it clearer which case the
"Note:" in the code refers to.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 24 Nov 2014 16:42:36 -0800 |
parents | 6a254a2dd37c |
children | 208ec8ca7c79 |
comparison
equal
deleted
inserted
replaced
23396:6a254a2dd37c | 23397:c7c95838be9a |
---|---|
341 resolving manifests | 341 resolving manifests |
342 branchmerge: True, force: False, partial: False | 342 branchmerge: True, force: False, partial: False |
343 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | 343 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
344 preserving b for resolve of b | 344 preserving b for resolve of b |
345 preserving rev for resolve of rev | 345 preserving rev for resolve of rev |
346 b: both created -> m | 346 b: both renamed from a -> m |
347 updating: b 1/2 files (50.00%) | 347 updating: b 1/2 files (50.00%) |
348 picked tool 'python ../merge' for b (binary False symlink False) | 348 picked tool 'python ../merge' for b (binary False symlink False) |
349 merging b | 349 merging b |
350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | 350 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
351 rev: versions differ -> m | 351 rev: versions differ -> m |