Am 30.12.2010 22:38, schrieb "Martin v. Löwis": >> Also, it's not really necessary for everyone to merge every change from >> maintenance to trunk: a) they can do multiple commits on the same >> subject and merge once, and b) if the change is small and no problems can >> be expected from merging, merging can also be done by others, just like >> the mass merging we had once from trunk -> py3k (just more convenient for >> the one doing the merge). > > But you can't use Mercurial's merge functionality for that, right? > You have to use some kind of transplant/cherry-picking to merge from the > 3.3 branch to the 3.2 branch, right?
Oh, I wrote the above assuming 3.2->3.3 merging. For the other direction you need cherry-picking, yes. Georg _______________________________________________ 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
