[glob2-devel] hg problem

[Stéphane Magnenat]

Hi,

I've done an error with mercurial. I wanted to add the new Greek translation 
someone sent me. I thought my rep was at tip of master branch, but apparently 
wasn't because I ended up created a new branch, also named master, 
originating from Erik's bugfix branch. Can I merge this latest changeset only 
in master? Shouldn't we merge this whole bugfix branch into master?

It might be me, but mercurial is tricky to use because it's never obvious if 
the basic abstraction is the changeset, the parent/child relation or the 
branch.

Thanks,

Steph

-- 
http://stephane.magnenat.net