VCS comparison table
ae at op5.se
Wed Oct 25 10:35:52 BST 2006
Matthew D. Fuller wrote:
> On Fri, Oct 20, 2006 at 02:48:52PM -0700 I heard the voice of
> Carl Worth, and lo! it spake thus:
>> (since pull seems the only way to synch up without infinite new
>> merge commits being added back and forth).
> The infinite-merge-commits case doesn't happen in bzr-land because we
> generally don't merge other branches except when the branch owner says
> "Hey, I've got something for you to merge". If you were to setup a
> script to merge two branches back and forth until they were 'equal',
> yes, it'd churn away until you filled up your disk with the N bytes of
> metadata every new revision uses up.
This is new to me. At work, we merge our toy repositories back and forth
between devs only. There is no central repo at all. Does this mean that
each merge would add one extra commit per time the one I'm merging with
has merged with me?
Andreas Ericsson andreas.ericsson at op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
More information about the bazaar