I've added an mpatch command to hgtk on the default branch.  It
accepts a patch reject file as it's only argument:

hgtk mpatch tortoisehg/hgtk/gdialog.py.rej

When you run it, it does four things:

# tries to apply the rejected hunks using standard patch techniques
# tries various fallback approaches (ignoring missing context, etc)
# the .rej file is updated to only include hunks that could still not be applied
# if any rejected hunks were applied, it launches your diff tool
showing you the changes made

Feel free to try this out using an unstable nightly build.

I'm looking for feedback..

--
Steve Borho

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
Tortoisehg-discuss mailing list
Tortoisehg-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss

Reply via email to