cherry-picking with transplant?

tomba a3nbau902 at sneakemail.com
Wed Mar 25 17:29:43 CDT 2009


Has anyone tried to adapt rebase extension to support "cherry-picking"?

Scenario: there are 2 branches: mainline (default) and release branch (1.0).
Most of work on mainline is for subsequent release (2.0).
However, we decide to back-port some changes (perhaps fixes) to 1.0 
after they are checked in to 2.0.

Transplant extension has the down-side of creating .rej files in case of 
conflicts or changes in close proximity and forcing manual 
(non-graphical - no kdiff3) merge.

Rebase extension uses the full power of Mercurial merge and merge tools.
However, it can only rebase from given changeset all the way to the tip 
of the rebased branch.
It would be great if rebase extension supported a new --upto option, to 
support cherry-picking, e.g.:

o 6
|
o 5
|
o 4
|
| o 3 [1.0]
|/
o 2
|
o 1

hg rebase --keep --source 4 --upto 5 --dest 3 --collapse -m "Backport 
fix to bug 123"



More information about the Mercurial mailing list