author | Bryan O'Sullivan <bos@serpentine.com> |
Tue, 02 Oct 2007 13:46:59 -0700 | |
changeset 5353 | c6adf2be6069 |
parent 5318 | c6682cdada2f |
permissions | -rwxr-xr-x |
#!/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