[python-committers] 3.2 branch in mercurial

[Petri Lehtinen]

Senthil Kumaran wrote:
> I think, there is something wrong with state of hg.python.org at the moment.
> 
> On a fresh clone from hg.python.org
> 
> $hg clone ssh://hg@hg.python.org/cpython cpython
> 
> If I do, hg branches, the 3.2 is shown as inactive. Did something
> change recently?

>From hg help glossary:

    If a named branch has no topological heads, it is considered to be
    inactive.

So AFAICS, this just means that 3.2 has been merged to default (which
always should be the case).

(snip)
> searching for changes
> abort: push creates new remote heads!
> (did you forget to merge? use push -f to force)
> 
> Was there any wrong merge? Or am I doing something wrong?

I think you should merge to default before pushing. That's at least
what I always do. If the change shouldn't be made to 3.3 for some
reason, you should do a "null merge".

Please note that I'm not a hg expert, rather a hg disliker :)

Petri