Mercurial > hg
view tests/test-up-issue1456 @ 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 | f331de880cbb |
children |
line wrap: on
line source
#!/bin/sh rm -rf a hg init a cd a echo foo > foo hg ci -qAm0 chmod +x foo hg ci -m1 hg co -q 0 echo dirty > foo hg up -c hg up -q cat foo hg st -A echo '% validate update of standalone execute bit change' hg up -C 0 chmod -x foo hg ci -m removeexec hg up -C 0 hg up hg st