Mozilla: hg as a collaboration tool

Kelly O'Hair Kelly.Ohair at Sun.COM
Wed Feb 6 17:31:23 CST 2008


I wonder he pointed Mercurial directly at kdiff3 and ran into the argument
order problem? That tends to make merge changes go haywire.

I'll post to the blog about this.

-kto

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
> 


More information about the Mercurial mailing list