-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 As far as I remember, python-dev decided that each branch should have a single head. We probably have even a push hook to avoid mistakes. Or we should :).
But we don't explain what is suppose to be done when a developer is working in a feature, she updates her repository clone, rebase her patches, collapses all her local changesets to a single giant changeset, commit it locally, merge them to "default" and then she tries to push. But somebody else "raced" her and commit first, so she is trying to generate a new head. The standard approach in mercurial is for her to pull the changes and to do a merge before trying to push again (and hope nobody else "raced" her again, this time). But the merge will be visible in the project history, and I have the feeling that python-dev tries hard to keep a lineal history. Another usual approach would be to "pull" the changes and "rebase" the local unpushed changesets before trying again, to get a linear history. But no idea of what would happen when we have multiple local commits in several different branches. Never tried in this situation, and not sure that I want to try :). In any case, devguide is silent about this. I would suggest to write something to fill this gap. See, for instance, <http://hg.python.org/cpython/rev/9a817ab166e0>, <http://hg.python.org/cpython/graph/9a817ab166e0>. PS: I didn't merged 9a817ab166e0 to "3.x" because I don't know what plans Raymond has for 6544accfefc3. I guess he is waiting for buildbot results before merging to 3.x. - -- 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/ iQCVAwUBTYALuplgi5GaxT1NAQIpwgP/U7MTC59QKOn5/4PgFEe3L1q7tsiAs6Tb jLYhL8vXBjyY3Ct5bOXW9MBcagHa+Bk/hz/ohGcGP+PL3ZtqgXE9Zv6ZXRydnhWb GslPQnCnHjp8KMa3iE6wDMRskY46iDQtVh1QOo9UTi001jn5mqo2CLDugmFHVU+l lFEnXBCotGo= =SBiW -----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
