/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: Vincent Ladeuil
  • Date: 2009-09-09 15:27:48 UTC
  • mto: (4683.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4684.
  • Revision ID: v.ladeuil+lp@free.fr-20090909152748-vf90nnjybnp84zn2
Surprisingly, assertEqualDiff was wrong.

* bzrlib/tests/test_selftest.py:
(TestExtraAssertions.test_assertEqualDiff): The bug is hard enough
to encounter to deserve some tests.

* bzrlib/tests/__init__.py:
(TestCase.assertEqualDiff): Pedantic and an half.

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