-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
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
-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
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
On Wed, 16 Mar 2011 02:37:21 +0100
Jesus Cea j...@jcea.es 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
-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
On Tue, Mar 15, 2011 at 9:15 PM, Antoine Pitrou solip...@pitrou.net 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,
