tests/test-mq-merge.out
author Benjamin Pollack <benjamin@bitquabit.com>
Tue, 17 Mar 2009 11:47:40 -0400
changeset 7854 423b4482c5cb
parent 7627 fb32ae9c76e7
child 8433 9a398dd53bcc
permissions -rw-r--r--
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.

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