Mozilla: hg as a collaboration tool

[Guo Tang]

He forgot to setup hgmerge.cmd. The hgmerge.cmd does not come with 0.9.5 
binary installation package. So after "hg merge", he checked in his old 
version again.  I suggested him to take a look at 

http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram

to setup hgmerge.cmd

Can anyone here really do lots of merge in windows environment suggest a 
tool, and post to his blog?

Regards,
Guo 
On Wed, 6 Feb 2008, Zbynek Winkler wrote:

> On 06/02/2008, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> > There's some trouble brewing within Mozilla (mostly the Mobile group, AFAICS)
> > over the use of hg. I've been tracking this for a few days, but haven't yet been
> > able to get a good grasp of what their problems have been. Today, there's this
> > post from Brad Lassey about the problems. It would probably be good if we could
> > see what their problems are and what we can do to make things easier.
> >
> > http://blog.mozilla.com/blassey/2008/02/05/hg-as-a-colaboration-tool/
> 
> Well, the post does not really say what went wrong... or did I miss
> it? Just develop along on a private branch, merge with the trunk at
> the end and look at the resulting resulting diff of the development
> head against the trunk head, no?
> 
> Zbynek
> 
> -- 
> http://robotika.cz/
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>