tests/test-mq-merge.out
author Sune Foldager <cryo@cyanite.org>
Thu, 08 Oct 2009 10:07:41 +0200
changeset 9577 b91960aed018
parent 9110 561ff8d9e4f0
child 10185 7637fe4f525d
permissions -rw-r--r--
rebase: improve error and debug messages

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
created new head
a
b
merging with queue at: .hg/patches.1
applying rm_a
now at: rm_a
b
popping rm_a
popping .hg.patches.merge.marker
patch queue now empty

% 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
now at: patcha