RFC: HOWTO: Cherrypicking patches from "xemacs"

Michael Sperber sperber at deinprogramm.de
Thu Mar 6 14:06:31 EST 2008


"Stephen J. Turnbull" <stephen at xemacs.org> writes:

> The transplant extension does update the Mercurial history of the
> branch.  According to the transplant documentation [at selenic.com,
> url to be provided], this can be annoying if you repeatedly
> cherrypick, but not all of the patches you want make it into
> "xemacs-beta" in a timely fashion, as Mercurial will repeatedly
> complain about conflicts.  So, use of the transplant extension may be
> somewhat more complex than just using patch.  On the other hand, if
> you have other local modifications, then even if you mess up, you'll
> have all history needed to reconstruct your favorite configuration of
> XEmacs in the workspace.

I think these problems mostly occur when you pull patches you've
previously transplanted, which I don't think is likely to occur in this
setting, i.e. temporary cherry-picked branches.  (I manage Scheme 48
releases exclusively using "hg transplant", and it works great.)

-- 
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla



More information about the XEmacs-Beta mailing list