/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-03-12 04:00:48 UTC
  • mto: (4132.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 4135.
  • Revision ID: v.ladeuil+lp@free.fr-20090312040048-x8w6pv3h7xfcn7mx
Fallback to old revision id if the current one doesn't exist in
the requested revision inventory.

* bzrlib/tests/blackbox/test_cat.py:
(TestCat.test_cat_different_id): Complete test.

* bzrlib/inventory.py:
(Inventory.__repr__): Limit debug output to 2048 characters or big
inventories produce too much noise.

* bzrlib/builtins.py:
(cmd_cat._run): The file id in the basis tree may not exist in the
requested revision. Catch the exception and try with the file id
in the revision tree.

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