Mercurial > hg
view tests/test-mq-qpush-fail.out @ 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 | f3404b7f37ca |
children |
line wrap: on
line source
adding foo % test qpush on empty series no patches in series popping bad-patch popping patch2 popping patch1 patch queue now empty applying patch1 applying patch2 applying bad-patch transaction abort! rollback completed cleaning up working directory...done abort: decoding near 'é': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! changeset: 0:bbd179dfa0a7 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add foo % bar should be gone; other unknown/ignored files should still be around ? untracked-file I .hgignore C foo % preparing qpush of a missing patch no patches applied applying patch1 now at: patch1 % now we expect the push to fail, but it should NOT complain about patch1 applying patch2 unable to read patch2 now at: patch1 % preparing qpush of missing patch with no patch applied popping patch1 patch queue now empty % qpush should fail the same way as below applying patch1 unable to read patch1