# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1190551244 -7200
# Node ID c6682cdada2f2cc200d4f0e9aa5e763e9453bfe3
# Parent  ef65d6ec114eaa324d22cbc1ae329b7440ea9a03
Test renaming files brought by merge second parent (issue 746)

diff --git a/tests/test-rename-after-merge b/tests/test-rename-after-merge
new file mode 100755
--- /dev/null
+++ b/tests/test-rename-after-merge
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Test issue 746: renaming files brought by the
+# second parent of a merge was broken.
+
+echo % create source repository
+hg init t
+cd t
+echo a > a
+hg ci -Am a
+cd ..
+
+echo % fork source repository
+hg clone t t2
+cd t2
+echo b > b
+hg ci -Am b
+
+echo % update source repository
+cd ../t
+echo a >> a
+hg ci -m a2
+
+echo % merge repositories
+hg pull ../t2
+hg merge
+
+echo % rename b as c
+hg mv b c
+hg st
+echo % rename back c as b
+hg mv c b
+hg st
diff --git a/tests/test-rename-after-merge.out b/tests/test-rename-after-merge.out
new file mode 100644
--- /dev/null
+++ b/tests/test-rename-after-merge.out
@@ -0,0 +1,20 @@
+% create source repository
+adding a
+% fork source repository
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+adding b
+% update source repository
+% merge repositories
+pulling from ../t2
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+(run 'hg heads' to see heads, 'hg merge' to merge)
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% rename b as c
+A c
+R b
+% rename back c as b