Mercurial > hg
view tests/test-rename-after-merge @ 8819:e93ab347c814
test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong
This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails. Failure is more frequent with faster hardware.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | d821ea464465 |
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 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 cd .. # Test issue 1476: renaming a first parent file into # another first parent file while none of them belong to # the second parent was broken echo % test issue 1476 hg init repo1476 cd repo1476 echo a > a hg ci -Am adda echo b1 > b1 echo b2 > b2 hg ci -Am changea hg up -C 0 echo c1 > c1 echo c2 > c2 hg ci -Am addcandd echo % merge heads hg merge hg mv -Af c1 c2 echo % commit issue 1476 hg ci -m merge hg log -r tip -C -v | grep copies hg rollback hg up -C . echo % merge heads again hg merge hg mv -Af b1 b2 echo % commit issue 1476 with a rename on the other side hg ci -m merge hg log -r tip -C -v | grep copies