-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 22/03/11 22:20, Nick Coghlan wrote: > There's a third option (which is what I've been doing): > > 6. Pull > 7. Merge the heads on the oldest branch that now has multiple heads > 8. Merge that branch to the next branch in line as usual. > 9. Repeat 7-8 until all branches, up to and including default have been merged > 10. Push.
Then you are merging to the newer branches, commits done by some other developer that, maybe, doesn't want to merge yet for whatever reason. For instance, because she is waiting for a buildbot cycle. Also, you have to deal with whatever problem you have during the merge yourself (for instance, the API changed and the merge is not trivial), when this work should be done by the original committer. - -- Jesus Cea Avion _/_/ _/_/_/ _/_/_/ j...@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQCVAwUBTYqpS5lgi5GaxT1NAQK/6gP8C6lcTUqnvLE9+szJVLAWzjkwqt8lDCOq a2Zqi9geOnvUfTYTJgChAL54MZXofzp9Xc/m6bHQV7H9KUuUngcttUkr30De2e4c 410+h9RJFjDBxgpVut+r2jptuH2aOtxaTVt7VLEluO9q8YXmPH1uQV241vtfe3HN TXopfow/CXA= =M1WJ -----END PGP SIGNATURE----- _______________________________________________ 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
