hg heads command inconsistant?
Dirkjan Ochtman
dirkjan at ochtman.nl
Fri Jan 8 09:30:42 UTC 2010
On Fri, Jan 8, 2010 at 10:13, Alexander Schatten
<ml_alexanderschatten at gmx.at> wrote:
> That is correct. But then I close one branch by
>
> hg ci --close-branch -m "closing message"
Closing branches works only on named branches.
> ok; when I call "hg merge" I get the (in my understanding) correct feedback:
>
> "abort: branch 'default' has one head - please merge with an explicit rev"
>
> Exactly, there is only one (active) branch. Now, still "hg heads" shows two heads, and what is disturbing, even when called with "hg heads --active".
This is after you've committed your merge?
> So in my understanding there is something wrong here, or do I have a misunderstanding of the "heads" and "branches" concept?
There is some subtle behavior here, having to do with the differences
between plain changelog graph heads and named-branch heads. It might
be a bug, it might just be hard to understand. If you can provide a
little more info, we can see if we should mark it as a bug.
Cheers,
Dirkjan
More information about the Mercurial
mailing list