[RFC] internal patch implementation

Chris Mason chris.mason at oracle.com
Thu Jan 11 07:01:18 CST 2007


On Thu, Jan 11, 2007 at 10:56:10AM +0100, Johannes Stezenbach wrote:
> > I can add this stuff, but how much magic do we really want in the patch
> > code?
> 
> I'd say don't do it.  patchutils has some tools to repair
> broken patches, e.g. unwrapdiff and dehtmldiff.
> I'm also uncomfortable with mpatch fixing up things
> behind your back. The user should be notified that the
> patch is broken.
> 
> BTW, I wanted to try mpatch http://oss.oracle.com/mercurial/mason/mpatch
> a while back, and found that the --dry-run option didn't work,
> and it scribbled over my files. So I dropped it in the floor immediately.

Sorry, looks like --dry-run was only a dry run for the reject merging.
For now I'll drop it.

-chris



More information about the Mercurial-devel mailing list