[Python-Dev] Hg: inter-branch workflow

[Georg Brandl]

On 21.03.2011 20:40, Raymond Hettinger wrote:
> 
> On Mar 21, 2011, at 11:56 AM, Daniel Stutzbach wrote:
>>
>>
>> People love it because it's a very powerful tool.  People hate it because it
>> allows you to shoot yourself in the foot.
> 
> There's a certain irony in this.   The original motivation for version control
> was to be a safety rope, to serve as a productivity tool to make sure
> that work never got lost.
>
> 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).

That last one is not true.

> If we gave-up on the "svnmerge on steroids workflow",
> the use of Hg would become dirt simple.   I've used it that way
> in personal projects for a couple months and it is 
> remarkably easy, taking only minutes to learn.
> It also works with Hg right out of the box; no need
> for extensions, customizations, or a slew of advanced Hg
> features.

Whether you use rebase or not is completely unrelated to the branch
workflow.  (Indeed, without branch merging rebase works even better,
since as we saw it doesn't handle branch merges.)

Georg