Fixing rebase rather than avoiding it

[Stefan Monnier]

> See this piece of history:

> 2 Fix bug #234 (merge)
> 1.1.1 Fix bug #234
> 1 Whatever

> What valuable information is provided by revision 1.1.1?

Indeed, none.  1.1.1 and 2 are really the same thing, and indeed "bzr
pull" would have worked wonders.

In more complex scenarios, the valuable information provided is that if
someone had clone the branch at 1.1.1, then she could "bzr pull" (or
"bzr merge" without risking spurious conflicts).


        Stefan