##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4658:17f5d206 default
r5080:73fdc8bd default
Show More
test-mq-qpush-fail.out
19 lines | 501 B | text/plain | TextLexer
/ tests / test-mq-qpush-fail.out
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
mq: test that qpush cleans things up when it fails
 r4658 adding foo
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