author | Benoit Allard <benoit@aeteurope.nl> |
Wed, 18 Jun 2008 19:04:10 +0200 | |
changeset 6704 | 8251ffb35725 |
parent 5608 | 784eadabd985 |
child 7689 | d821ea464465 |
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 hg st echo % rename b as c hg mv b c hg st echo % rename back c as b hg mv c b hg st