test-mq-merge.out
25 lines
| 537 B
| text/plain
|
TextLexer
/ tests / test-mq-merge.out
|
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 | ||||
|
r6336 | created new head | ||
|
r4333 | a | ||
b | ||||
merging with queue at: .hg/patches.1 | ||||
applying rm_a | ||||
|
r7627 | now at: rm_a | ||
|
r4333 | b | ||
|
r9110 | popping rm_a | ||
popping .hg.patches.merge.marker | ||||
|
r7627 | patch queue now empty | ||
|
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 | ||||
|
r7627 | now at: patcha | ||