##// END OF EJS Templates
Dummy-merge with c655432c2c24 (issue1860)
Dummy-merge with c655432c2c24 (issue1860)

File last commit:

r9599:f3404b7f merge default
r9601:11ace572 merge default
Show More
test-mq-qpush-fail.out
32 lines | 813 B | text/plain | TextLexer
/ tests / test-mq-qpush-fail.out
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