/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: Daniel Watkins
  • Date: 2008-03-08 18:25:44 UTC
  • mto: (3276.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3277.
  • Revision ID: d.m.watkins@warwick.ac.uk-20080308182544-sw9fi33k7wu5rku7
Added hook to ensure that 'bzr hooks' can deal with named plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/distributed_intro.txt
11
11
The decentralized with shared mainline workflow
12
12
-----------------------------------------------
13
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.
 
14
In this workflow, each developer has their own branch or branches, plus commit rights to the main branch. They do their work in their personal branch, then merge it into the mainline when it is ready.
17
15
 
18
16
.. image:: images/workflows_shared.png
19
17
 
20
18
Other distributed workflows are explored later in this chapter.
21
 
 
22
 
..
23
 
   vim: tw=74 ft=rst