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

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

fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Matt Mackall - - Load All Authors

File last commit:

r5764:8a5d8fb5 default
r6206:0b6f1249 default
Show More
test-mq-qpush-fail.out
19 lines | 501 B | text/plain | TextLexer
/ tests / test-mq-qpush-fail.out
History | Annotation | Raw |Copy content |Copy permalink
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