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