8
This document describes some basic workflow for using Bazaar_. This doesn't
9
try to explain *why* every step is done, but more gives recommendations
10
about what is considered a good way to work with Bazaar_.
11
Bazaar_ is designed to be very flexible in workflows, from fully
12
decentralized to mostly centralized.
13
The practices here are meant to help ease the user into more advanced usage
14
of Bazaar_, and allowing them to work in a mix of centralized and
15
decentralized operation.
11
This document describes a possible workflow for using Bazaar_. That of
12
using Bazaar_, the distributed version control system, in a centralized
13
manner. Bazaar_ is designed to be very flexible and allows several
14
different workflows, from fully decentralized to mostly centralized. The
15
workflow used here is meant to ease a new user into more advanced usage of
16
Bazaar_, and allow them to work in a mix of centralized and decentralized
17
In general, this document is meant for people in a work setting. Where
18
several people are working on the same codebase, and want to work with
19
eachother and keep in sync. However, this workflow is also applicable to a
20
single developer, who might work on several machines, and wants to keep in
19
In general, this document is meant for users coming from a background of
20
centralized version control systems such as CVS or subversion. It is
21
common in work settings to have a single central server hosting the
22
codebase, with several people working on this codebase, keeping their work
23
in sync. This workflow is also applicable to a single developer working
24
on several different machines.
23
26
.. _Bazaar: http://bazaar-vcs.org
46
53
Bazaar_ branches generally copy the history information around with them,
47
54
which is part of how you can work in a fully decentralized manner. As an
48
optimization, it is possible for branches to combine their storage needs,
49
so that you do not need to copy around all of this history information
50
whenever you create a new branch.
52
The best way to do this is to create a `Shared Repository`_. In general,
53
branches will share their storage if they exist in a subdirectory of a
54
`Shared Repository`_. So lets setup a `Shared Repository`_ in our home
55
directory, thus all branches we create underneath will share their history
55
optimization, it is possible for related branches to combine their storage
56
needs so that you do not need to copy around all of this history
57
information whenever you create a new branch.
59
The best way to do this is to create a `Shared Repository`_. In
60
general, branches will share their storage if they exist in a
61
subdirectory of a `Shared Repository`_. So let's set up a `Shared
62
Repository`_ in our home directory, thus all branches we create
63
underneath will share their history storage.
58
67
% bzr init-repo --trees ~
61
70
Setting up a remote Repository
62
------------------------------
64
Many times you want a location where data is stored separate from where
65
you do your work. This workflow is required by centralized systems (CVS/SVN).
66
Usually they are on separate machines, but not always. This is actually a
67
pretty good setup, especially in a work environment. Because it ensures
68
a central location where data can be backed up, and means that if something
69
happens to a developer's machine, no committed work has been lost.
71
So lets set up a shared location for our project. Again, we will use a
72
`Shared Repository`_ to optimize disk usage.::
71
---------------------------------
73
Many times you want a location where data is stored separately from where
74
you do your work. This workflow is required by centralized systems
75
(CVS/SVN). Usually they are on separate machines, but not always. This is
76
actually a pretty good setup, especially in a work environment. Since it
77
ensures a central location where data can be backed up, and means that if
78
something happens to a developer's machine, no committed work has to be
81
So let's set up a shared location for our project on a remote machine
82
called ``centralhost``. Again, we will use a
83
`Shared Repository`_ to optimize disk usage.
74
87
% bzr init-repo --no-trees sftp://centralhost/srv/bzr/
76
89
You can think of this step as similar to setting up a new cvsroot, or
77
subversion repository (only obviously it is a little bit simpler).
80
Starting to version an existing project
90
subversion repository. The {{{--no-trees}}} option tells bzr to not
91
populate the directory with a working tree. This is appropriate,
92
since no one will be making changes directly in the branches within
93
the central repository.
96
Migrating an existing project to Bazaar
81
97
=======================================
83
Now that we have a repository, lets get going with a new project. Most of
84
the time, you will already have some code that you started working with,
99
Now that we have a repository, let's create a versioned project. Most of
100
the time, you will already have some code that you are working with,
85
101
that you now want to version using Bazaar_. If the code was originally
86
102
in source control, there are many ways to convert the project to Bazaar_
87
without losing any history. However, this is outside of the scope of this
88
document. See XXXReferenceConversionOfHistory_.
103
without losing any history. However, this is outside the scope of this
104
document. See `Tracking Upstream`_ for some possibilities (section
105
"Converting and keeping history").
107
.. _Tracking Upstream: http://bazaar-vcs.org/TrackingUpstream
110
XXX: We really need a different document for discussing conversion of a
111
project. Right now TrackingUpstream is the best we have, though.
91
114
Developer 1: Creating the first revision
92
115
----------------------------------------
94
117
So first, we want to create a branch in our remote Repository, where we
95
will want to host the project. Let's assume we have a project named
96
"sigil" that we want to start versioning, and create an empty branch::
118
want to host the project. Let's assume we have a project named
119
"sigil" that we want to put under version control.
98
123
% bzr init sftp://centralhost/srv/bzr/sigil
100
125
This can be thought of as the "HEAD" branch in CVS terms, or as the "trunk"
101
in Subversion terms. We typically call this the ``dev`` branch.
126
in Subversion terms. We will call this the ``dev`` branch.
103
I prefer working in a subdirectory of ``$HOME`` to avoid collisions with all
104
the other stuff that ends up in ``$HOME``. Also, we will want a project
128
I prefer working in a subdirectory of my home directory to avoid collisions with all
129
the other files that end up there. Also, we will want a project
105
130
directory where we can hold all of the different branches we end up
117
144
% bzr commit -m "Initial import of Sigil"
119
There are many ways to setup your working directory, but the above way
120
will makes it easy to handle working with feature/bugfix branches. And one
147
In the previous section, we created an empty branch (the ``/sigil``
148
branch) on ``centralhost``, and then checkout out this empty branch
149
onto our workstation to add files from our existing project. There
150
are many ways to set up your working directory, but the steps above
151
make it easy to handle working with feature/bugfix branches. And one
121
152
of the strong points of Bazaar_ is how well it works with branches.
123
154
At this point, because you have a 'checkout' of the remote branch, any
124
commits you make in ``dev/`` will automatically be saved both locally,
125
and on ``centralhost``.
155
commits you make in ``~/work/sigil/dev/`` will automatically be saved
156
both locally, and on ``centralhost``.
128
159
Developer N: Getting a working copy of the project
129
160
--------------------------------------------------
131
162
Since the first developer did all of the work of creating the project,
132
all other developers can just get a checkout of that branch. They should
133
still follow `Setting User Email`_ and `Setting up a local Repository`_.
163
all other developers would just checkout that branch. **They should
164
still follow** `Setting User Email`_ and `Setting up a local Repository`_.
135
Then to get a copy of the current tip::
166
To get a copy of the current development tree::
137
168
% cd ~/work/sigil
138
169
% bzr checkout sftp://centralhost/srv/bzr/sigil dev
140
171
Now that two people both have a checkout of
141
172
``sftp://centralhost/srv/bzr/sigil``, there will be times when one of
142
them is out of date with the current version. Bazaar_ will inform the user
143
of this and prevent them from committing. To get up to date use ``bzr
144
update``, which will update the tree with the remote changes. This may
145
require resolving conflicts, in the case that the same files have been
173
the checkouts will be out of date with the current version.
174
At commit time, Bazaar_ will inform the user of this and prevent them from
175
committing. To get up to date, use ``bzr update`` to update the
176
tree with the remote changes. This may require resolving conflicts if the
177
same files have been modified.
149
180
Developing on separate branches
150
181
===============================
152
183
So far everyone is working and committing their changes into the same
153
branch. Which means that everyone needs to update fairly regularly, and
184
branch. This means that everyone needs to update fairly regularly and
154
185
deal with other people's changes. Also, if one person commits something
155
which breaks the codebase, then everyone has to deal with it.
186
that breaks the codebase, then upon syncing, everyone will get the
157
Usually, it is better to do development on individual branches, and then
189
Usually, it is better to do development on different branches, and then
158
190
integrate those back into the main branch, once they are stable. This is
159
191
one of the biggest changes from working with CVS/SVN. They both allow you
160
192
to work on separate branches, but their merging algorithms are fairly
161
weak, so it is difficult to keep things synchronized. Bazaar_ merges track
193
weak, so it is difficult to keep things synchronized. Bazaar_ tracks
162
194
what has already been merged, and can even apply changes to files that
163
195
have been renamed.
176
210
% bzr checkout sftp://centralhost/srv/bzr/sigil/doodle-fixes doodle-fixes
177
211
% cd doodle-fixes
179
We now have a place to make any fixes to doodles that we need. And we
180
won't interrupt people who are working on other parts of the code.
181
Because we have a checkout, any commits made in the ``doodle-fixes/`` will
182
also show up on ``centralhost``. [#nestedbranches_]
183
It is also completely possible to have 2 developers collaborate on one of
184
these branches, just like they would have collaborated on the ``dev``
213
We now have a place to make any fixes we need to ``doodle``. And we would
214
not interrupt people who are working on other parts of the code. Because
215
we have a checkout, any commits made in the ``~/work/sigil/doodle-fixes/``
216
will also show up on ``centralhost``. [#nestedbranches]_ It is also
217
possible to have two developers collaborate on one of these branches, just
218
like they would have collaborated on the ``dev`` branch. [#cbranch]_
220
.. [#nestedbranches] It may look odd to have a branch in a subdirectory of
221
another branch. This is just fine, and you can think of it as a
222
hierarchical namespace where the nested branch is derived from the
187
225
.. [#cbranch] When using lots of independent branches, having to retype
188
226
the full URL all the time takes a lot of typing. We are looking into
191
229
Which is designed to take a base branch, create a new public branch,
192
230
and create a checkout of that branch, all with much less typing.
193
231
Configuring ``cbranch`` is outside the scope of this document, but the
194
final commands look like ``bzr cbranch dev my-feature-branch``
196
.. [#nestedbranches] It may look odd to have a branch in a subdirectory of
197
another branch. However, this is just fine, and you can think of it as
198
a heirarchial namespace. Where the nested branch is derived from the
201
.. _bzrtools: https://launchpad.net/products/bzrtools
232
final commands are similar to:
236
% bzr cbranch dev my-feature-branch
238
.. _bzrtools: http://bazaar-vcs.org/BzrTools
204
241
Merging changes back
205
242
--------------------
207
When it is decided that some of the changes in ``doodle-fixes`` is ready
208
to be merged into the main tree, simply do::
244
When it is decided that some of the changes in ``doodle-fixes`` are ready
245
to be merged into the main branch, simply do::
210
247
% cd ~/work/sigil/dev
211
248
% bzr merge ../doodle-fixes
213
Now the changes are available in the ``dev`` branch, but they haven't been
214
committed yet. This is the time when you want to review the final changes,
215
and make sure they are what you want. ``bzr status`` and ``bzr diff`` are
216
good tools to use here. Also, there may be some conflicts in files, if
217
there were changes made to the same file. Bazaar_ will prevent you from
218
committing until you have resolved these conflicts. That way you don't
219
accidentally commit the conflict markers. ``bzr status`` will show the
220
conflicts along with the other changes, or you can use ``bzr conflicts``
221
to just list conflicts. Use ``bzr resolve file/name`` or ``bzr resolve
222
--all`` once conflicts have been handled.[#resolve]_
223
If you have a conflict that is particularly difficult to solve you may
224
want to use the ``bzr remerge`` command. It will let you try different
225
merge algorithms, as well as let you see the original source lines
250
Now the changes are available in the ``dev`` branch, but they have not
251
been committed yet. This is the time when you want to review the final
252
changes, and double check the code to make sure it compiles cleanly and
253
passes the test suite. The commands ``bzr status`` and ``bzr diff`` are
254
good tools to use here. Also, this is the time to resolve any conflicts.
255
Bazaar_ will prevent you from committing until you have resolved these
256
conflicts. That way you don't accidentally commit the conflict markers.
257
The command ``bzr status`` will show the conflicts along with the other
258
changes, or you can use ``bzr conflicts`` to just list conflicts. Use
259
``bzr resolve file/name`` or ``bzr resolve --all`` once conflicts have
260
been handled. [#resolve]_ If you have a conflict that is particularly
261
difficult to solve you may want to use the ``bzr remerge`` command. It
262
will let you try different merge algorithms, as well as let you see the
263
original source lines (``--show-base``).
228
265
.. [#resolve] Some systems make you resolve conflicts as part of the merge
229
266
process. We have found that it is usually easier to resolve conflicts
259
297
Shared Repository
260
298
-----------------
262
Bazaar_ has the concept of a `Shared Repository`_. This is similar to the
263
concept of other RCS's repository. Such as in Subversion, where you have a
264
remote repository, which is where all of the history is stored, and
265
locally you don't have any history information, only a checkout of the
266
working tree files. Note that "Shared" in this context means shared
267
between branches. It *may* be shared between people, but standalone
268
branches can also be shared between people.
300
Bazaar_ has the concept of a "Shared Repository". This is similar to
301
the traditional concept of a repository in other RCSs like CVS and
302
Subversion. For example, in Subversion you have a remote repository,
303
which is where all of the history is stored, and locally you don't
304
have any history information, only a checkout of the working tree
305
files. Note that "Shared" in this context means shared between
306
branches. It *may* be shared between people, but standalone branches
307
can also be shared between people.
270
In Bazaar_ terms, a `Shared Repository`_ is a location where multiple
271
branches can **share** their revision history information. Because Bazaar_
272
wants to support decentralized workflows, it is possible for every branch
273
to maintain its own revision history information. But this is often
274
inefficient, since often branches share history, and they might as well
275
share the storage as well.
309
In Bazaar_ terms, a "Shared Repository" is a location where multiple
310
branches can **share** their revision history information. In order to
311
support decentralized workflows, it is possible for every branch to
312
store its own revision history information. But this is often
313
inefficient, since related branches share history, and they might as
314
well share the storage as well.
added
removed
doc/centralized_workflow.txt
