Mercurial > hg

view tests/test-mq-merge.out @ 6743:86e8187b721a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify flag handling add _checklink var to dirstate introduce dirstate.flagfunc switch users of util.execfunc/linkfunc to flagfunc change manifestdict.set to take a flags string change ctx.fileflags to ctx.flags change gitmode func to a dict remove util.execfunc/linkfunc
author Matt Mackall <mpm@selenic.com>
date Thu, 26 Jun 2008 13:46:34 -0500
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