Mercurial > hg
view tests/test-rename-after-merge @ 6067:57c1a7052982
Option to log to only show changesets within a specified branch.
author | Dustin Sallings <dustin@spy.net> |
---|---|
date | Fri, 08 Feb 2008 21:31:03 -0800 |
parents | 784eadabd985 |
children | d821ea464465 |
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 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