tests/test-mq-merge.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 04 Oct 2009 22:23:11 +0200
changeset 9526 457a30ed8ffb
parent 8433 9a398dd53bcc
child 9110 561ff8d9e4f0
permissions -rw-r--r--
convert/darcs: fix file renaming (issue1853)

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
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