[Python-Dev] Branch ancestry hiccup on the Mercurial repo

[Georg Brandl]

On 01/01/2013 09:20 AM, Senthil Kumaran wrote:
> 
> 
> On Mon, Dec 31, 2012 at 10:47 PM, Antoine Pitrou <solipsis at pitrou.net
> <mailto:solipsis at pitrou.net>> wrote:
> 
> 
>     Chances are the problem won't be very annoying in practice, but just
>     FYI.
> 
> 
> I dont get this. I see 2.7 as a separate un-merged branch again
> (http://hg.python.org/cpython/graph). Just curious, what happened next?  

You can still see the merge near the bottom of the graph on that URL.
Nothing too bad happened, as we usually don't merge 2.7 into 3.x anyway,
it does not matter that Mercurial now considers all changes before that
accident as "merged".

Merry 2013,
Georg