Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-after-merge @ 5395:e73a83af7926
hgk: add basic usage and configuration documentation
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 05 Oct 2007 23:40:33 +0200 |
parents | c6682cdada2f |
children |
line wrap: on
line source
#!/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