GUI hg import ?

Steve Borho steve at borho.org
Sat Jan 23 13:15:48 CST 2010


On Sat, Jan 23, 2010 at 5:27 AM, hg user <mercurialuser at gmail.com> wrote:
> Probably I'm missing some easy spot here....
>
> I did some "hg export" from repository TRUNK and I need to import them into
> repository BRANCH.
>
> Out of 34 exports:
> - 29 apply cleanly
> - 1 doesn't apply due to cdhanges in spacing (how can I force
> --ignore-whitespace for hg import?)
> - 1 doesn't apply because 2 hunks don't apply. These hunks should remove two
> files.
>
> The remaining 3 patches have hunks that don't apply.
>
> So I'm asking if there is a GUI tool to easy "hg import" for these 3
> patches... using mq is ok
>
> I work on Windows, hgtortoise and have windiff and kdiff3 installed...

There's experimental support for mpatch in the TortoiseHg nightly
unstable builds.  You launch it via:  hgtk mpatch path\to\file.rej

It works just like the original mpatch script, except with fewer
options.  It tries various heuristics to apply the rejected patch
hunks then uses THG's visual diff subsystem to show you the results of
the hunks that were applied.

If I had a bunch of spare time, I would add support for this into
Mercurial's applydiff itself so the mpatch fallback code can be
launched directly when patches fail to apply on the first try.

--
Steve Borho


More information about the Mercurial mailing list