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. 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
