cherrypicking with the transpant extension

Uwe Brauer oub at mat.ucm.es
Wed Sep 26 08:40:39 UTC 2018


Hi

I have besides the default branch, a named branch called full, which
should contain what was added new to the default branch, but not what
was deleted on the default branch.

So I thought to use the transplant extension

And I did 

 hg up full
 hg transplant -b default 

And then picked up the last commit where I added stuff.

However I obtained

applying fe3bf65ec363
patching file ChangeLog
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file ChangeLog.rej
patching file sec1-cont-flow-hs.tex
Hunk #1 FAILED at 84
1 out of 1 hunks FAILED -- saving rejects to file sec1-cont-flow-hs.tex.rej
patch failed to apply
abort: fix up the working directory and run hg transplant --continue

Is there any way to fix this interactive during the transplant
operation?

I tried to use the graft command, but then he did not even ask me but
just deleted text in my full branch (since in earlier commits in the
default branch I deleted text).



More information about the Mercurial mailing list