On Mon, Mar 21, 2011 at 2:59 AM, Georg Brandl <g.bra...@gmx.net> wrote: > Well, YMMV. But instead of spreading FUD you might want to state *why*.
David isn't the only one this kind of thing blew up on during the sprints (although in my case, it may have been "hg rollback" rather than rebasing). Essentially, if using the cascaded local repositories workflow (i.e. local 3.1 -> local 3.2 -> local default -> hg.python.org/cpython), by the time you go to do the push to remote, your local history already includes a change on 3.1, a 3.1->3.2 merge and a 3.2->default merge. The history changing commands appear to have trouble coping with that correctly. Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
