Mercurial > hg

view tests/test-mq-merge.out @ 8817:6c9dce20ed70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed patch.eol bug that truncated all patched lines to one character Also updated the import-eol test to test with lines longer than one character, and also empty lines.
author Colin Caughie <c.caughie@indigovision.com>
date Tue, 16 Jun 2009 16:22:42 +0100
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