hgmerge.py in mainstream mercurial distribution

Arve Knudsen arve.knudsen at gmail.com
Tue Dec 11 03:19:27 CST 2007


We had a chat in #mercurial yesterday regarding what needs to be improved in
hgmerge.py to be considered for inclusion in mercurial proper. Based on that
input, I will try to write an improved revision sometime this week (improved
as in more compact, and with satisfactory configurability).

Arve

On Dec 11, 2007 8:58 AM, dhruva <dhruvakm at gmail.com> wrote:

> Hi,
>
> On Dec 11, 2007 1:00 PM, Patrick Mézard <pmezard at gmail.com> wrote:
> > dhruva a écrit :
> > > IMHO, having a dependency on cygwin for something that can easily be
> > > done in python is not a very good idea.
> >
> > I still don't understand where this dependency comes from.
>
> The default hgmerge script is a shell script for which you need a bash
> shell (or equivalent) to run.
>
> -dky
>
> --
> Contents reflect my personal views only!
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial-devel/attachments/20071211/03be2874/attachment.htm 


More information about the Mercurial-devel mailing list