Mercurial > hg
view tests/test-rename-after-merge @ 5567:56e9f7b2d8fa
rename: add test for moving untracked files in directories
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 01 Dec 2007 12:54:34 -0600 |
parents | c6682cdada2f |
children | 784eadabd985 |
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