1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
|
Workflows
=========
Bazaar is just a tool
---------------------
One of the best things about Bazaar is that it supports many
different ways of working together. This means that you can
start with one workflow and adapt it over time as circumstances
change. There is no "one true way" that always makes sense and
there never will be. The section provides a brief overview of
some popular workflows supported by Bazaar.
Solo
----
Whether developing software, editing documents or changing configuration files, having an easy-to-use VCS tool can help. A single user can use this workflow effectively for managing projects where they are the only contributor.
.. image:: images/workflows_single.png
Advantages over not using version control at all:
* backup of old versions
* rollback to an earlier state
* tracking of history.
The key features of Bazaar appropriate for this workflow are low administration (no server setup) and ease of use.
Partner
-------
Sometimes two people need to work together sharing changes as they go. This commonly starts off as a *Solo* workflow (see above) or a team-oriented workflow (see below). At some point, the second person takes a branch (copy including history) of what the first person has done. They can then work is parallel exchanging changes by merging when appropriate.
.. image:: images/workflows_peer.png
Advantages over *Solo* are:
* easier sharing of changes
* each line of each text file can be attributed to a particular change including who changed it, when and why.
When implementing this workflow, Bazaar's advantages over CVS and Subversion include:
* no server to setup
* intelligent merging means merging multiple times isn't painful.
Centralized
-----------
Also known as *lock-step*. This is essentially the same as the workflow encouraged/enforced by CVS and Subversion. All developers work on the same branch (or branches). They run ``bzr update`` to get their checkout up-to-date, then ``bzr commit`` to commit.
.. image:: images/workflows_centralized.png
Subversion and CVS are good choices for implementing this workflow because they make it easy. Unlike the vast majority of distributed VCS tools, Bazaar makes it easy as well by directly supporting it. In addition, Bazaar provides some important advantages over CVS and Subversion:
* much better branching and merging
* better renaming support.
Centralized with local commits
------------------------------
This is essentially the same as the *Centralized* model, except that when developers are making a series of changes, they do ``commit --local`` or unbind their checkout, then commit their work to the shared mainline when it is complete.
.. image:: images/workflows_localcommit.png
Advantages over *Centralized*:
* Can work offline, e.g. when disconnected during travel
* Less chance for a bad commit to interfere with everyone else's work
Subversion and CVS do not support this model. Other distributed VCS tools can support it but do so less directly than Bazaar does.
Decentralized with shared mainline
----------------------------------
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.
.. image:: images/workflows_shared.png
Advantage over *Centralized with local commits*:
* Easier organization of work - separate changes can be developed in their own branches
* Developers can merge one another's personal branches when working on something together
Subversion and CVS do not support this model. Other distributed VCS tools support it. When selecting a DVCS tool for this workflow, look for ease of use, high quality merging, good renaming support and efficient storage (e.g. shared repositories), all of which are strengths of Bazaar.
Decentralized with human gatekeeper
-----------------------------------
In this workflow, each developer has their own branch or branches, plus read-only access to the main branch. One developer (the gatekeeper) has commit rights to the main branch. When a developer wants their work merged, they ask the gatekeeper to merge it. The gatekeeper does code review, and merges the work into the main branch if it meets the necessary standards.
.. image:: images/workflows_gatekeeper.png
Advantage over *Decentralized with shared mainline*:
* Code is always reviewed before it enters the mainline.
A companion tool of Bazaar's called Bundle Buggy can be very useful for tracking what changes are up for review, their status and reviewer comments. Subversion and CVS do not support this model. Other distributed VCS tools can support it. When selecting a DVCS tool for this workflow, once again look for ease of use, high quality merging, good renaming support and efficient storage.
Decentralized with automatic gatekeeper
---------------------------------------
In this workflow, each developer has their own branch or branches, plus read-only access to the mainline. A software gatekeeper (e.g. PQM) has commit rights to the main branch. When a developer wants their work merged, they request another person to review it. Once passed review, either the original author or the reviewer asks the gatekeeper to merge it, depending on team policies. The gatekeeper does a merge, a compile, and runs the test suite. If the code passes, it is merged into the mainline.
Note: As an alternative, the review step can be skipped and the author can submit the change to the automatic gatekeeper without it. (This is particularly appropriate when using practices such as Pair Programming that effectively promote just-in-time reviews instead of reviewing code as a separate step.)
.. image:: images/workflows_pqm.png
Advantages over *Decentralized with human gatekeeper*:
* Code is always tested before it enters the mainline (so the integrity of the mainline is higher)
* Scales better as teams grow.
A companion tool of Bazaar's called Patch Queue Manager (PQM) can provide the automated gatekeeper capability. Otherwise, the comments on tool selection given for *Decentralized with human gatekeeper* apply here as well.
Implementing a workflow
-----------------------
For an in depth look at how to implement each of the workflows above,
see chapters 3 and beyond in this manual. First though, chapter 2
explains some important pre-requisites including installation, general
usage instructions and configuration tips.
|