confused about push/pull/merge and append_revisions_only

[Alexander Belchenko]

Chris Hecker пишет:
>> That is the difference between merging your branch into trunk, and 
>> merging trunk into your branch (direction matters)
> 
> I think I understand now, thanks everybody.  The bummer is it makes the
> workflow kinda crappy to have to have another clean branch on every
> machine to merge into.

You can use bzr-colo plugin to keep everything together.