diff options
Diffstat (limited to 'tests/test-rename-merge1.t')
| -rw-r--r-- | tests/test-rename-merge1.t | 56 |
1 files changed, 9 insertions, 47 deletions
diff --git a/tests/test-rename-merge1.t b/tests/test-rename-merge1.t index f6b5f52..5a77cba 100644 --- a/tests/test-rename-merge1.t +++ b/tests/test-rename-merge1.t @@ -28,15 +28,15 @@ unmatched files in other: b b2 - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): c2 -> a2 ! b -> a * b2 -> a2 ! checking for directory renames a2: divergent renames -> dr resolving manifests - overwrite: False, partial: False - ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c + overwrite None partial False + ancestor af1939970a1c local 044f8520aeeb+ remote 85c198ef2f6c a: remote moved to b -> m b2: remote created -> g preserving a for resolve of b @@ -68,9 +68,9 @@ $ hg ci -m "merge" $ hg debugindex b - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 67 ..... 1 57eacc201a7f 000000000000 000000000000 (re) - 1 67 72 ..... 3 4727ba907962 000000000000 57eacc201a7f (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 67 0 1 57eacc201a7f 000000000000 000000000000 + 1 67 72 1 3 4727ba907962 000000000000 57eacc201a7f $ hg debugrename b b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66 @@ -95,6 +95,9 @@ We'd rather not warn on divergent renames done in the same changeset (issue2113) $ hg up c761c6948de0 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg up + note: possible conflict - b was renamed multiple times to: + b3 + b4 2 files updated, 0 files merged, 1 files removed, 0 files unresolved Check for issue2642 @@ -123,8 +126,6 @@ Check for issue2642 $ cat f2 c0 - $ cd .. - Check for issue2089 $ hg init repo2089 @@ -154,42 +155,3 @@ Check for issue2089 $ cat f2 c2 - - $ cd .. - -Check for issue3074 - - $ hg init repo3074 - $ cd repo3074 - $ echo foo > file - $ hg add file - $ hg commit -m "added file" - $ hg mv file newfile - $ hg commit -m "renamed file" - $ hg update 0 - 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ hg rm file - $ hg commit -m "deleted file" - created new head - $ hg merge --debug - searching for copies back to rev 1 - unmatched files in other: - newfile - all copies found (* = to merge, ! = divergent, % = renamed and deleted): - newfile -> file % - checking for directory renames - file: rename and delete -> rd - resolving manifests - overwrite: False, partial: False - ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 - newfile: remote created -> g - updating: file 1/2 files (50.00%) - note: possible conflict - file was deleted and renamed to: - newfile - updating: newfile 2/2 files (100.00%) - getting newfile - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - (branch merge, don't forget to commit) - $ hg status - M newfile - $ cd .. |