Home Original page

[Python-Dev] Hg: inter-branch workflow

Antoine Pitrou solipsis at pitrou.net
Mon Mar 21 19:38:18 CET 2011 
On Mon, 21 Mar 2011 14:29:54 -0400
Barry Warsaw <barry at python.org> wrote:
> >
> >I don't think many hg users advocate rebase, really. AFAICT the
> >Mercurial developers themselves don't seem to use it (they do use mq,
> >OTOH).
> 
> I guess that begs the question then. ;)  
> 
> What harm would there be in relaxing the SHOULD in this paragraph to MAY?
> 
> "You should collapse changesets of a single feature or bugfix before pushing
> the result to the main repository.

Because it's really SHOULD.
Apparently some people misunderstand this statement. "collapse
changesets of a single feature or bugfix" doesn't mean you must avoid
merges. If that's the impression it gives then the wording SHOULD (;-))
be changed.

The paragraph is aimed at the temptation people may have to commit many
changesets for a single feature/bugfix and push them all even though
some of them don't leave the source tree in a stable state. What it
says is that we don't want work-in-progress changesets in the public
history.

Again, a better wording is welcome.

Regards

Antoine.
More information about the Python-Dev mailing list