On Mon, Jan 11, 2010 at 3:01 PM, Kyle Altendorf <kyle.altend...@gmail.com> wrote: > On Sun, Jan 10, 2010 at 10:57 AM, Steve Borho <st...@borho.org> wrote: >> [snip] >> >> # Integrate mpatch or wiggle for .rej file handing. Or use external diff >> tools > > $1.00 all right here. But as always, thanks to all for whatever work > you do. TortoiseHg is a pleasure to work with.
Thanks. I had a look at mpatch yesterday, and I think we lucked out a bit. mpatch was built on top of Mercurial's patch.py circa about two years ago. I think we can combine a couple of it's files together and package it in tortoisehg/util and pretty quickly have a fallback path for rejected patches. The downside is there's a good case to be made that this should be integrated back into Mercurial, so I'll probably spend some time doing that after the 0.10 release. -- 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