--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge-commit.t Sat Sep 11 11:18:47 2010 +0200
@@ -0,0 +1,184 @@
+# Check that renames are correctly saved by a commit after a merge
+
+Test with the merge on 3 having the rename on the local parent
+
+ $ hg init a
+ $ cd a
+
+ $ echo line1 > foo
+ $ hg add foo
+ $ hg ci -m '0: add foo'
+
+ $ echo line2 >> foo
+ $ hg ci -m '1: change foo'
+
+ $ hg up -C 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg mv foo bar
+ $ rm bar
+ $ echo line0 > bar
+ $ echo line1 >> bar
+ $ hg ci -m '2: mv foo bar; change bar'
+ created new head
+
+ $ hg merge 1
+ merging bar and foo to bar
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+
+ $ cat bar
+ line0
+ line1
+ line2
+
+ $ hg ci -m '3: merge with local rename'
+
+ $ hg debugindex .hg/store/data/bar.i
+ 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 .hg/store/data/foo.i
+ 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:
+
+ $ hg up -C 2
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ rm bar
+ $ echo line1 > bar
+ $ hg ci -m '4: revert content change from rev 2'
+ created new head
+
+ $ hg log --template '{rev}:{node|short} {parents}\n'
+ 4:2263c1be0967 2:0f2ff26688b9
+ 3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d
+ 2:0f2ff26688b9 0:2665aaee66e9
+ 1:5cd961e4045d
+ 0:2665aaee66e9
+
+This should use bar@rev2 as the ancestor:
+
+ $ hg --debug merge 3
+ searching for copies back to rev 1
+ resolving manifests
+ 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%)
+ picked tool 'internal:merge' for bar (binary False symlink False)
+ merging bar
+ my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
+ premerge successful
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+
+ $ cat bar
+ line1
+ line2
+
+ $ hg ci -m '5: merge'
+
+ $ hg debugindex .hg/store/data/bar.i
+ 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
+on the remote parent:
+
+ $ cd ..
+ $ hg clone -U -r 1 -r 2 a b
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 3 changes to 2 files (+1 heads)
+ $ cd b
+
+ $ hg up -C 1
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg merge 2
+ merging foo and bar to bar
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+
+ $ cat bar
+ line0
+ line1
+ line2
+
+ $ hg ci -m '3: merge with remote rename'
+
+ $ hg debugindex .hg/store/data/bar.i
+ 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 .hg/store/data/foo.i
+ 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:
+
+ $ hg up -C 2
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ rm bar
+ $ echo line1 > bar
+ $ hg ci -m '4: revert content change from rev 2'
+ created new head
+
+ $ hg log --template '{rev}:{node|short} {parents}\n'
+ 4:2263c1be0967 2:0f2ff26688b9
+ 3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9
+ 2:0f2ff26688b9 0:2665aaee66e9
+ 1:5cd961e4045d
+ 0:2665aaee66e9
+
+This should use bar@rev2 as the ancestor:
+
+ $ hg --debug merge 3
+ searching for copies back to rev 1
+ resolving manifests
+ 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%)
+ picked tool 'internal:merge' for bar (binary False symlink False)
+ merging bar
+ my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
+ premerge successful
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+
+ $ cat bar
+ line1
+ line2
+
+ $ hg ci -m '5: merge'
+
+ $ hg debugindex .hg/store/data/bar.i
+ 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
+