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

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

run-tests: give each child its own tmp dir (issue1911)...
run-tests: give each child its own tmp dir (issue1911) Fixes bug introduced by f8b4df4b033d (issue1911: --tmpdir plus parallel mode = fail), and also fixes the long-standing quirk that parallel mode created multiple /tmp/hgtests.XXXXXX directories. Now there is only one /tmp/hgtests.XXXXXX, with child0, child1, etc. under it.
Mads Kiilerich - - Load All Authors

File last commit:

r9110:561ff8d9 default
r9899:be574a37 stable
Show More
test-mq-merge.out
25 lines | 537 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
Martin Geisler
mq: lowercase output...
 r7627 now at: rm_a
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
 r4333 b
Mads Kiilerich
mq: qpop now tells which patches are popped...
 r9110 popping rm_a
popping .hg.patches.merge.marker
Martin Geisler
mq: lowercase output...
 r7627 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
applying patcha
Martin Geisler
mq: lowercase output...
 r7627 now at: patcha