Bazaar User Guide: Workflows

[Ian Clatworthy]

Eugene Wee wrote:
> Hi,
> 
> 
> Ian Clatworthy wrote:
>> Assuming no one else has committed anything, running 'bzr revno' on
>> the shared mainline shows 101. In comparison, if 'push' had been run
>> directly from the work branch instead of a merge+commmit, 'bzr revno'
>> would show 104.
> 
> I must say that a light bulb turned on in my head when you gave that
> example.

Good. I need to get that example into the User Guide, together with some
diagrams. It's much easier to follow with diagrams.

> Actually, bzr merge does not incorporate a commit (it is just "update +
> edit"). So, from what I understand of Ian's example, the commit to the
> main branch comes from committing in the checkout after merging from the
> working branch.

Right.

Ian C.