On 03/06/16 23:50, R. David Murray wrote: > I don't understand how it happened, but apparently I got a merge commit > backward and merged 3.6 into 3.5 and pushed it without realizing what > had happened. If anyone has any clue how to reverse this cleanly, > please let me know. (There are a couple people at the sprints looking > in to it, but the mercurial guys aren't here so we are short on experts).
Bed time in Spain (hours ago, actually), but I think you could just "rollback" the merge commit with a regular "hg help revert" or "hg help backout". -- Jesús Cea Avión _/_/ _/_/_/ _/_/_/ j...@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ Twitter: @jcea _/_/ _/_/ _/_/_/_/_/ jabber / xmpp:j...@jabber.org _/_/ _/_/ _/_/ _/_/ _/_/ "Things are not so easy" _/_/ _/_/ _/_/ _/_/ _/_/ _/_/ "My name is Dump, Core Dump" _/_/_/ _/_/_/ _/_/ _/_/ "El amor es poner tu felicidad en la felicidad de otro" - Leibniz
signature.asc
Description: OpenPGP digital signature
_______________________________________________ python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
