Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue322 @ 3506:9de0e64545a3
Test that we notice the empty files from the second parent during a merge
This didn't work with 0.9.1, but was fixed by 05257fd28591.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 25 Oct 2006 02:51:27 -0300 |
parents | 3d5547845158 |
children | 9dcf9d45cab8 |
line wrap: on
line source
#!/bin/sh # http://www.selenic.com/mercurial/bts/issue322 echo % file replaced with directory hg init a cd a echo a > a hg commit -Ama rm a mkdir a echo a > a/a echo % should fail - would corrupt dirstate hg add a/a cd .. echo % directory replaced with file hg init c cd c mkdir a echo a > a/a hg commit -Ama rm -rf a echo a > a echo % should fail - would corrupt dirstate hg add a cd .. echo % directory replaced with file hg init d cd d mkdir b mkdir b/c echo a > b/c/d hg commit -Ama rm -rf b echo a > b echo % should fail - would corrupt dirstate hg add b exit 0