/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-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

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