diff options
Diffstat (limited to 'tests/test-merge-commit.t')
| -rw-r--r-- | tests/test-merge-commit.t | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t index 23a6e16..bbd3986 100644 --- a/tests/test-merge-commit.t +++ b/tests/test-merge-commit.t @@ -35,17 +35,17 @@ Test with the merge on 3 having the rename on the local parent $ hg ci -m '3: merge with local rename' $ hg debugindex bar - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) - 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 77 0 2 d35118874825 000000000000 000000000000 + 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) - 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 7 0 0 690b295714ae 000000000000 000000000000 + 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 Revert the content change from rev 2: @@ -69,8 +69,8 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 + overwrite None partial False + ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28 bar: versions differ -> m preserving bar for resolve of bar updating: bar 1/1 files (100.00%) @@ -88,11 +88,11 @@ This should use bar@rev2 as the ancestor: $ hg ci -m '5: merge' $ hg debugindex bar - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) - 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) - 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) - 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 77 0 2 d35118874825 000000000000 000000000000 + 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 + 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 + 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd Same thing, but with the merge on 3 having the rename @@ -122,17 +122,17 @@ on the remote parent: $ hg ci -m '3: merge with remote rename' $ hg debugindex bar - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) - 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 77 0 2 d35118874825 000000000000 000000000000 + 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) - 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 7 0 0 690b295714ae 000000000000 000000000000 + 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 Revert the content change from rev 2: @@ -156,8 +156,8 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 searching for copies back to rev 1 resolving manifests - overwrite: False, partial: False - ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 + overwrite None partial False + ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0 bar: versions differ -> m preserving bar for resolve of bar updating: bar 1/1 files (100.00%) @@ -175,10 +175,9 @@ This should use bar@rev2 as the ancestor: $ hg ci -m '5: merge' $ hg debugindex bar - rev offset length ..... linkrev nodeid p1 p2 (re) - 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) - 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) - 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) - 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) + rev offset length base linkrev nodeid p1 p2 + 0 0 77 0 2 d35118874825 000000000000 000000000000 + 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 + 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 + 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd - $ cd .. |