Mercurial > hg
view tests/test-issue322 @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 08 May 2007 02:59:13 -0500 |
parents | 9dcf9d45cab8 |
children | 7a7d4937272b |
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 -r 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 -r b echo a > b echo % should fail - would corrupt dirstate hg add b exit 0