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

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

patch: remove applydiff() useless updatedir and rejmerge arguments
patch: remove applydiff() useless updatedir and rejmerge arguments
Patrick Mezard - - Load All Authors

File last commit:

r6628:f18f14ba default
r7147:94cf0d1f default
Show More
test-mq-merge.out
24 lines | 522 B | text/plain | TextLexer
/ tests / test-mq-merge.out
History | Source | Raw |Copy content |Copy permalink
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 adding a
adding b
copy .hg/patches to .hg/patches.1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
M b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Brendan Cully
Make mergepatch save queue now that qpush isn't.
 r4437 Patch queue now empty
Patrick Mezard
test-mq-merge: test mq merge and explicit patch queue
 r6628
% init t2
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create the reference queue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge
merging with queue at refqueue
(working directory not at tip)
applying patcha
Now at: patcha