Branch-aware hg merge in a branchy repository

Dirkjan Ochtman dirkjan at ochtman.nl
Wed Jun 25 09:05:09 CDT 2008


On Wed, Jun 25, 2008 at 15:46, Alpár Jüttner <alpar at cs.elte.hu> wrote:
> Could you tell me how an average user can find out this trick?
> Before your post, I used 'hg clone -r brach repo' and I was always very
> annoyed because it cloned only the branch but 'default' was the current
> branch in the cloned version.
>
> Now I checked carefully
>      * the hg's built in help
>      * the whole mercurial website (well, only the English part of it)
>      * the "unofficial" hg book
> and I couldn't find a single word about this repo#branch notation.

Yeah. This has been a rarely used feature of hg for a while, along
with much of the rest of named branches. Since no crew developers
apparently actually use named branches, there are a number of rough
edges. However, I've now started using this at work, so there should
be a bunch of fixes coming up (the one referenced in the other
subthread is merely the first of these). So if you have more
annoyances like this, please file them in the bug tracking system
(preferably after you've checked if there's already something there).
I'll also try to come up with some documentation for the repo#branch
case.

> What happens if I have a named branch and a tag sharing the same name?
> How can I refer to them?

I'm not sure at this point, but it's probably not a good idea to have that.

Cheers,

Dirkjan



More information about the Mercurial mailing list