Branch ancestry hiccup on the Mercurial repo
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
o changeset: 81129:ee8d999b6e05
|\ branch: 3.2
| | parent: 81124:e4ea38a92c4d
| | parent: 81128:3436769a7964
| | user: Antoine Pitrou
On Mon, Dec 31, 2012 at 10:47 PM, Antoine Pitrou
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
On 01/01/2013 09:20 AM, Senthil Kumaran wrote:
On Mon, Dec 31, 2012 at 10:47 PM, Antoine Pitrou
mailto:solipsis@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
participants (3)
-
Antoine Pitrou
-
Georg Brandl
-
Senthil Kumaran