Mercurial > hg
view tests/test-addremove @ 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 | 627399330c7d |
children |
line wrap: on
line source
#!/bin/sh hg init rep cd rep mkdir dir touch foo dir/bar hg -v addremove hg -v commit -m "add 1" -d "1000000 0" cd dir/ touch ../foo_2 bar_2 hg -v addremove hg -v commit -m "add 2" -d "1000000 0" cd .. hg init sim cd sim echo a > a echo a >> a echo a >> a echo c > c hg commit -Ama mv a b rm c echo d > d hg addremove -n -s 50 # issue 1696 hg addremove -s 50 hg commit -mb