[Python-Dev] Hg: inter-branch workflow

[Nick Coghlan]

On Thu, Mar 17, 2011 at 10:03 AM, Reid Kleckner <reid.kleckner at gmail.com> wrote:
> 98% of the time, if you don't actually have merge conflicts, applying
> your change over someone else's without testing will work, so I feel
> like rebasing a single commit without testing is no big deal.  On the
> off chance that it breaks, the buildbots will find out.  Just don't
> rebase a whole feature branch of commits, leave the final merge in.

This is one of the reasons we're advocating only collapsed patches in
the main repository, so those untested intermediate revisions don't
exist.

Then the commits will consist of either cohesive changes, or else
minor bookkeeping stuff like fixing NEWS, ACKS or the merge status.

Cheers,
Nick.

-- 
Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia