[Python-Dev] Hg: inter-branch workflow

[Antoine Pitrou]

On Mon, 21 Mar 2011 12:40:08 -0700
Raymond Hettinger <raymond.hettinger at gmail.com> wrote:
> 
> Now we seem to be advocating a complex, fragile workflow that
> is hard to learn, hard to get right, that let's you shoot yourself in 
> the foot, and that has rebasing/collapsing steps that destroy and 
> rewrite history (an possibly muck-up your repo if there was an
> intervening push).

FWIW, rebase is *not* advocated in the devguide. It's not even a
suggestion. The only sentence which mentions it starts with

   "If you are using the rebase_ extension"

which is a pretty clear hint that it's an individual choice and not
something we recommend.

Regards

Antoine.