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

2013-01-01 Thread Georg Brandl
On 01/01/2013 09:20 AM, Senthil Kumaran wrote: > > > On Mon, Dec 31, 2012 at 10:47 PM, Antoine Pitrou > 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

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

2013-01-01 Thread Senthil Kumaran
On Mon, Dec 31, 2012 at 10:47 PM, Antoine Pitrou 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? Thanks, Senthil

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

2012-12-31 Thread Antoine Pitrou
Hello, For the record, due to a bug in the "hg graft" command, a recent changeset of mine basically merged branch 2.7 into 3.2: $ hg log -r "ee8d999b6e05 or parents(ee8d999b6e05)" -G ochangeset: 81129:ee8d999b6e05 |\ branch: 3.2 | | parent: 81124:e4ea38a92c4d | | parent: