2011/3/15 Jesus Cea <j...@jcea.es>: > -----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 <j...@jcea.es> 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
