cherry-picking with transplant?
Arne Babenhauserheide
arne_bab at web.de
Thu Mar 26 02:10:04 CDT 2009
Am Donnerstag 26 März 2009 02:38:43 schrieb Isaac Jurado:
> On Thu, Mar 26, 2009 at 2:24 AM, tomba <a3nbau902 at sneakemail.com> wrote:
> > There is a problem with using hg export followed by hg import. When
> > there is a conflict, the patch fails with .rej file, instead of
> > bringing up a merge tool (kdiff3).
>
> Well, in that case I guess it makes sense to write such extension, but
> rebase is not the one. Probably transplant needs an update, rewrite or
> deprecation in favour of a new one.
Should we open a bug "transplant should use the defined merge tools" or
similar?
Best wishes,
Arne
--
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the
history of free software.
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)
-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
Url : http://selenic.com/pipermail/mercurial/attachments/20090326/160f28f9/attachment.pgp
More information about the Mercurial
mailing list