[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[glob2-devel] hg problem
From: |
Stéphane Magnenat |
Subject: |
[glob2-devel] hg problem |
Date: |
Thu, 11 Oct 2007 14:51:26 +0200 |
User-agent: |
KMail/1.9.7 |
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
- [glob2-devel] hg problem,
Stéphane Magnenat <=