Re: [Python-Dev] devguide: managing "+1 heads"
On Tue, Mar 15, 2011 at 9:15 PM, Antoine Pitrou wrote: > On Wed, 16 Mar 2011 02:00:42 +0100 > Jesus Cea wrote: >> >> 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). > > This is indeed the standard approach, so I'm not sure what the point of > mentioning it in the devguide would be. I don't think the devguide > should turn into a Mercurial tutorial: there are plenty of them on the > Web. Given our stated preference for pushing collapsed changesets, it does seem worthwhile to explicitly mention the pull/merge/push case as a case where a collapsed changeset isn't expected. 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
Re: [Python-Dev] devguide: managing "+1 heads"
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 16/03/11 02:42, Benjamin Peterson wrote: >> For instance, merging between branches (in which direction) is >> established here, but not in the devguide. > > What are you talking about? > http://docs.python.org/devguide/committing.html#forward-porting I beg your pardon. 3AM in Spain. Time to get some sleep, it seems... - -- 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/ iQCVAwUBTYAWOZlgi5GaxT1NAQJD6gP5AbqT+PP/1DPmzVUXy0iqWuy+HE1PJC6X dBzvE3abcqCsCEIhmqn8NW//jXUzGZ162dF+3xJ9IViCZhOol3n5d+E/Yna67/uh 48LJIV0bUrXDkg/nm0/VJGyx0GUqFx546mv9M3dsjMOxd7Q6ZbSfCp/clyWa8Drn IwfdJMkGnAI= =NW3O -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
Re: [Python-Dev] devguide: managing "+1 heads"
On Wed, 16 Mar 2011 02:37:21 +0100 Jesus Cea wrote: > > Maybe a simple "try to keep the history lineal, as possible" and "feel > free to merge heads in the standard mercurial way". Well, can you propose a patch to add or improve wording? > For instance, merging between branches (in which direction) is > established here, but not in the devguide. It is: http://docs.python.org/devguide/committing.html#forward-porting Regards Antoine. ___ 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
Re: [Python-Dev] devguide: managing "+1 heads"
2011/3/15 Jesus Cea : > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > On 16/03/11 02:15, Antoine Pitrou wrote: >> On Wed, 16 Mar 2011 02:00:42 +0100 >> Jesus Cea wrote: >>> >>> 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). >> >> This is indeed the standard approach, so I'm not sure what the point of >> mentioning it in the devguide would be. I don't think the devguide >> should turn into a Mercurial tutorial: there are plenty of them on the >> Web. > > My point is that I was getting the "+1 head" warning. I know how to > solve it by myself, but I checked the devguide to learn if there was > some kind of policy about it. The devguide is silent about it. > > Maybe a simple "try to keep the history lineal, as possible" and "feel > free to merge heads in the standard mercurial way". > > In fact, we have discussed here the approach of collapsing local changes > to a single changeset when pushing to the central repository, but I > don't see any reference to this policy in the devguide. > > Unwritten "culture" is not good. Better for new contributors to read a > document and learn "the way" that to pick some details here, some there > after stepping over a lot of toes. > > For instance, merging between branches (in which direction) is > established here, but not in the devguide. What are you talking about? http://docs.python.org/devguide/committing.html#forward-porting -- Regards, Benjamin ___ 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
Re: [Python-Dev] devguide: managing "+1 heads"
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 16/03/11 02:15, Antoine Pitrou wrote: > On Wed, 16 Mar 2011 02:00:42 +0100 > Jesus Cea wrote: >> >> 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). > > This is indeed the standard approach, so I'm not sure what the point of > mentioning it in the devguide would be. I don't think the devguide > should turn into a Mercurial tutorial: there are plenty of them on the > Web. My point is that I was getting the "+1 head" warning. I know how to solve it by myself, but I checked the devguide to learn if there was some kind of policy about it. The devguide is silent about it. Maybe a simple "try to keep the history lineal, as possible" and "feel free to merge heads in the standard mercurial way". In fact, we have discussed here the approach of collapsing local changes to a single changeset when pushing to the central repository, but I don't see any reference to this policy in the devguide. Unwritten "culture" is not good. Better for new contributors to read a document and learn "the way" that to pick some details here, some there after stepping over a lot of toes. For instance, merging between branches (in which direction) is established here, but not in the devguide. - -- 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/ iQCVAwUBTYAUUZlgi5GaxT1NAQJp8wQAmuj5QLohUvAGRetajubTlizIMhgUEk1l 9kYn9XcfdtETHkM2t3Fmi73FscslNWXTT11kR1rqoyJUjS7XklcPGYtKQqWBAo+b qICXLKo6C150lRe5VRDWBlJCvUTpFGQddh3ouTjfPjW43sO1Sj/OWJb4H1tSkyjL smKW5SaSnXE= =46ku -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
Re: [Python-Dev] devguide: managing "+1 heads"
On Wed, 16 Mar 2011 02:00:42 +0100 Jesus Cea wrote: > > 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). This is indeed the standard approach, so I'm not sure what the point of mentioning it in the devguide would be. I don't think the devguide should turn into a Mercurial tutorial: there are plenty of them on the Web. Regardless, if you want to experiment with other approaches, please go ahead and report the results here. Regards Antoine. ___ 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
