[MERGE] Add Bazaar Zen section to the User Guide

[Robert Collins]

On Thu, 2008-05-08 at 13:02 +1000, Ian Clatworthy wrote:
> I recently gave an example on the mailing list that people found useful.
> At the time, I promised I'd add it to the User Guide. This patch takes
> the existing "Understanding Revision Numbering" section and combines it
> with an expanded version of that example to create a new section called
> "Bazaar Zen".
> 
> Thanks to a trunkload of people for their insights and comments in
> recent months about both Bazaar and its doc. At the risk of leaving out
> many contributors, I hope this section captures some of those insights
> from Matthieu Moy, Stephen Turnbull, John Yates, Eugene Wee, Matthew
> Fuller, ...
> 
> This is one of several TODO doc improvements I've been pondering for
> some time. I hope to squeeze a few of them in before we ship 1.5 and
> this one is likely to generate the most discussion so I'm submitting it
> first. :-)

Couple of things:

I'm sure that *I* don't want people to work in a particular way.
Bazaar's workflow features have come about by watching how people use
the tool and what behaviour seems to work well in different situations.

You also claim that bzr has internal differences vs git, darcs et al.
bzr and git are remarkably similar in regards to merge graph facilities;
only darcs is truely different.

Secondly, your description of why to use merge vs push confused me; it
confused me because these things are orthogonal; if one uses solely push
& pull & commit it is not possible to resolve concurrent activity.
Pushing from feature branches does not prevent concurrency, and only
merge+commit can resolve concurrent activity across branches. 

I think the goal of explaining the core activities of working with
concurrent development is good; I think this document creates confusion
(or at least, it left me confused; and if I get confused by it, with my
detail understanding of the space, I'm really worried other folk will be
left utterly stumped).

(Your prose reads fine, and if you don't understand the core it seems
clear; but its not, and that is I think the really potentially confusing
part of it).

Sorry,
Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080508/df2a6890/attachment.pgp