Pushing after merge considered harmful

[Neil Martinsen-Burrell]

Eli Zaretskii <eliz <at> gnu.org> writes:

> > Date: Tue, 26 Jan 2010 13:57:34 -0600
> > From: John Arbash Meinel <john <at> arbash-meinel.com>
> > CC: "Matthew D. Fuller" <fullermd <at> over-yonder.net>, bialix <at> ukr.net,
> >   bazaar <at> lists.canonical.com
> > 
> > > How many such non-programmer users are among Bazaar users?  Did
> > > anybody bother to take a poll?  My guess would be zero.  Why would a
> > > non-programmer use a VCS?
> > > 
> > > If I'm right, there's no need to double the documentation manpower.
> > 
> > It is most distinctly non-zero. The ubuntu documentation group
> > specifically uses this, and has a significant fraction of people with a
> > graphic design style background, and minimal 'programming' experience.
> > 
> > It also gets used for versioning office style documents, and people who
> > are using it to version $HOME (though I believe those are mostly
> > programmers using it for something else).
> 
> <Shrug> whatever.
> 
> Anyway, here's a proposal: if the Bazaar docs team explains the effect
> of the most important commands in terms of a history DAG, I will sit
> down and write a version of it that will be understandable by
> non-programmers.  Deal?

Gauntlet picked up.  See
http://bazaar.launchpad.net/~nmb/bzr/dag-docs/annotate/head%3A/doc/en/dag-guide/index.txt
which will be most readable by doing

$ bzr branch lp:~nmb/bzr/dag-docs
$ cd dag-docs/doc/en
$ make html

and looking at _build/html/dag-guide/index.html

Of course, comments are welcome, and I hope to have a chance soon to work on
push and pull, since those are the commands that started all of this, but
patches are even better than comments.  Using your branch above you can feel
free to make your own commits and submit them as merge proposals on Launchpad
against that branch.  I'll propose my branch for merging into bzr.dev once it
gets polished.

-Neil