Bazaar

Is this how a "Decentralized with shared mainline" works?

Asked by takabanana

Is this how a "Decentralized with shared mainline" works?

http://www.simplemedia.com/bazaar.gif

Just trying to understand how it works - before committing to using Bazaar :-)

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Martin Pool (mbp) said : 		#1

Not a bad diagram.

Normally you would have the local trunk mirror be bound to the real trunk. Then when you merge your feature into it and commit, that commit will be atomically done onto the main trunk. If other people have committed to the trunk in the interim, it will fail, and you'll have to bring in their changes.

In that case there is a single arrow at the right side, saying "merge and commit" from the feature branch into both the mirror and the trunk.

Can you help with this problem?

Provide an answer of your own, or ask takabanana for more information if necessary.

To post a message you must log in.