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

popping rm_a

popping .hg.patches.merge.marker

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, 1 files removed, 0 files unresolved

% merge

merging with queue at refqueue

applying patcha

patching file a

Hunk #1 FAILED at 0

1 out of 1 hunks FAILED -- saving rejects to file a.rej

patch failed, unable to continue (try -v)

patch failed, rejects left in working dir

patch didn't work out, merging patcha

1 files updated, 0 files merged, 1 files removed, 0 files unresolved

0 files updated, 2 files merged, 0 files removed, 0 files unresolved

(branch merge, don't forget to commit)

applying patcha2

now at: patcha2

% check patcha is still a git patch

diff --git a/a b/a

--- a/a

+++ b/a

@@ -1,1 +1,2 @@

-b

+a

+c

diff --git a/a b/aa

copy from a

copy to aa

--- a/a

+++ b/aa

@@ -1,1 +1,1 @@

-b

+a

% check patcha2 is still a regular patch