Re: Help me unstick my bzr, please.

[Giorgos Keramidas]

On Sat, 16 Jan 2010 11:54:41 +0200, Eli Zaretskii <address@hidden> wrote:
>> From: Lennart Borgman <address@hidden>
>> I do not understand. Can someone please explain to me why a bazaar
>> user have to take care of this?
>
> It's in the workflow described on the wiki: the process of merging a
> branch with the mainline involves two commands:
>
>   bzr merge
>   bzr commit
>
> The first one merges the text of the files, but does not combine their
> histories.  The second command finishes the merging process by
> updating the history so that it now includes both local commits and
> whatever happened in the mainline since the last time you merged from
> it.

Exactly.  This is not a 'problem' of bazaar, FWIW.  I's just the way
things work in all DVCS when you have committed local changes in a
non-bound branch.

Thank you Eli for writing up a very detailed explanation :-)