Improving Windows support
pmezard at gmail.com
Mon Apr 16 14:39:01 CDT 2007
TK Soh a écrit :
> Bottom line, we can't have a distributed VCS like Hg without the
> capability to merge. So IMO, Hg should provide it's own internal
> merging support. For now, perhaps one (written in python?) can be
> bundled with the Windows installer. Though some hacking might be
> required to make it work 'out of the box'.
Last time I checked for a merge tool for windows unit testing people
suggested to look at bzr. There is one module performing 3-way merge but
at this time I could not decide whether it was worth trying to isolate
it from other bzr sources or to rewrite it. BTW, it would be great to
find a way to share this kind of stuff (it might include mpatch too).
More information about the Mercurial