[MERGE] Add Bazaar Zen section to the User Guide

[Ian Clatworthy]

Robert Collins wrote:

> Why isn't something trivial like:
> 
> Revision Id's and Revision Numbers
> ----------------------------------
> 
> Revision Identifiers are globally unique identifiers for an individual
> revision in bzr. They are long, cumbersome to type and are not
> comparable to each other in any way. Revision id's are generated at
> commit time (or for imports from other systems, at the time of the
> import).
> 
> Bzr provides a much shorter identifier for revisions call a "revision
> number'. Revision numbers are dotted decimal identifiers that trace a
> path through the revision graph for a branch. Revision numbers are
> generally shorter than revision ids, and (within a single branch) can be
> compared with each other to get a sense of their graph relationship.
> Revision Numbers are generated on the fly when 'log' or other commands
> are executing, because they depend on the current branch tip.

I like that explanation. I've incorporated it into the Core concepts
section where we first introduce what a revision is.

> I can be specific about the confusion here - your example claimed to
> show 'using push', but here you are describing it as being 'sending [gnu
> diff?] patches to a upstream/gatekeeper'.

Ok, the new text is a lot better in this area I think.

Once again, thanks for the review. Updated patch attached.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ug-bazaar-zen-2.patch
Type: text/x-diff
Size: 19858 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080510/31b54fb1/attachment-0001.bin