Mercurial > hg

view tests/test-mq-merge.out @ 9529:e61e7b3e46d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.rename: do not abort if os.unlink fails (issue1840)
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 06 Oct 2009 10:45:23 +0200
parents 9a398dd53bcc
children 561ff8d9e4f0
line wrap: on
line source

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