Re: Release branch plans

[Stefan Monnier]

> Yes, you do, at least what _I_ am talking about.  I explained this at
> least twice in the past: the history is all messed up on the trunk as
> result of this.

No, it's not messed up.  Maybe you don't like it (not sure why), and
maybe `bzr log' shows it in a weird or messed up way (in which case you
should take it up with the bzr guys), but the history itself is very
much not messed up at all.

> You disagree with this being a problem, but I submit
> that this is akin to saying that the history is not important.

I care a lot about the VCS history metadata, which is why I insist that
we merge from the release branch onto the trunk.

> Maybe we should take a step back and ask ourselves why do we need to
> merge from the stable branch to the trunk at all?

Very simple: we want to make sure all the bug-fixes we install on the
stable branch don't get lost on the next release, and we want to reflect
this info into the VCS history so the VCS knows what's going on.


        Stefan