bzr-rebase behavior

[Jelmer Vernooij]

Am Dienstag, den 10.06.2008, 18:27 -0400 schrieb Stefan Monnier:
> Reading http://bazaar-vcs.org/Rebase, I'd like to know more about it,
> but can't find the info to add it to the Wiki, so .. here I am.
> 
> The main question is: what happens to the merge history.  If the branch
> that I want to rebase has its own merge history, will the rebased branch
> preserve that history, and if so how.

> Also if I have some other branch
> that merged from the branch that I rebase, is it possible to update that
> branch so that its merge info refers to the rebased version of
> the branch?
A rebased copy of a revision is not the equivalent of that revision -
it is the delta of that revision replayed on a different parent. Because
the parent is different (and sometimes the delta is slightly different
as well) the two shouldn't be considered equivalent by merge. 

rebase will store the old revision ids of the revisions you rebase in a
special revision property on the rebased revision. In theory, this could
be used to avoid merging a rebased revision R' if R was already merged.
However, bzr's merge algorithms don't use this revision property at the
moment.

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org