/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/distributed_intro.txt

  • Committer: mernst at mit
  • Date: 2008-10-16 10:57:16 UTC
  • mto: This revision was merged to the branch mainline in revision 3799.
  • Revision ID: mernst@csail.mit.edu-20081016105716-v8x8n5t2pf7f6uds
Improved documentation of stacked and lightweight branches

These patches improve the User Guide's documentation of stacked and
lightweight branches.

Section "1.2.6 Putting the concepts together" should mention stacked
branches and the difference between them and lightweight branches.  It
should also contain links to further details of the common scenarios.

Section "5.3.4 Getting a lightweight checkout" should mention stacked
branches as an option, and should link to all the options, not just some of
them.  It should also clarify that lightweight only applies to checkouts,
not to arbitrary branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/distributed_intro.txt
 
1
Distributed development
 
2
=======================
 
3
 
 
4
Motivation
 
5
----------
 
6
 
 
7
Distributed VCS tools offer new ways of working together,
 
8
ways that better reflect the modern world we live in and
 
9
ways that enable higher quality outcomes.
 
10
 
 
11
The decentralized with shared mainline workflow
 
12
-----------------------------------------------
 
13
 
 
14
In this workflow, each developer has their own branch or branches, plus
 
15
a checkout of the main branch. They do their work in their personal
 
16
branch, then merge it into the mainline when it is ready.
 
17
 
 
18
.. image:: images/workflows_shared.png
 
19
 
 
20
Other distributed workflows are explored later in this chapter.
 
21
 
 
22
.. 
 
23
   vim: tw=74 ft=rst