2007-04-07 22:42:26 +04:00
|
|
|
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
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2007-04-07 22:42:26 +04:00
|
|
|
a
|
|
|
|
b
|
|
|
|
merging with queue at: .hg/patches.1
|
|
|
|
applying rm_a
|
|
|
|
Now at: rm_a
|
|
|
|
b
|
2007-05-14 06:15:54 +04:00
|
|
|
Patch queue now empty
|
2008-05-24 20:11:34 +04:00
|
|
|
|
|
|
|
% 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
|