tests/test-mq-merge.out
author Martin Geisler <mg@daimi.au.dk>
Wed, 18 Feb 2009 00:44:38 +0100
changeset 7790 1817e45c2212
parent 7627 fb32ae9c76e7
child 8433 9a398dd53bcc
permissions -rw-r--r--
setup: use sys.executable to call hg Executing ".\hg" does not work on Windows, but we can instead ask Python to execute hg.

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
(working directory not at tip)
applying patcha
now at: patcha