Mercurial > hg
view tests/test-issue322 @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | 1de6e7e1bb9f |
children |
line wrap: on
line source
#!/bin/sh # http://mercurial.selenic.com/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