Re: VC and bzr.

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

> Óscar Fuentes <address@hidden> writes:
>
>> Remember that bzr considers the leftmost part of the DAG as a special
>> one.
>
> As does git (see --first-parent).

That is just a cosmetic feature. bzr makes the distinction by default
and at a deeper level. On some common scenarios it can lead to an
apparent history rewriting, with the DAG arms flipping sides. The bzr
developers implemented a repo switch for rejecting that effect, and
Emacs is using it. Which is precisely why `bzr push' won't work on a
general basis.

>> This is the reason why the Emacs repo is configured for rejecting
>> `bzr push' except for the simple case where the operation would build a
>> linear history on top of the previous one (i.e. a merge was
>> unnecessary.)
>
> Either merge or fast-forward.  That's exactly what you do with git as
> well.

We are talking about `push' here. `bzr push' works only if a
fast-forward is possible. Same for `bzr pull'. From my reading of the
man pages, git doesn't merge on `push' either.