Mercurial > hg

view tests/test-mq-merge.out @ 7475:90d8dfb481e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rewrite svn tests using svndump They are: - faster to run (12s vs 30s in test-convert-svn-branches case) - easier to craft - easier to debug - more portable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 06 Dec 2008 20:07:44 +0100
parents f18f14bae172
children fb32ae9c76e7
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
(working directory not at tip)
applying patcha
Now at: patcha