2
2
.. into HTML or text. In the future we plan to extract the example commands
3
3
.. and automatically test them.
5
.. This text was previously on the wiki at http://bazaar.canonical.com/IntroductionToBzr
5
.. This text was previously on the wiki at
6
.. http://bazaar.canonical.com/IntroductionToBzr
6
7
.. but has been moved into the source tree so it can be kept in sync with
7
8
.. the source and possibly automatically checked.
13
Current for bzr-0.7pre, 2006-01-06.
14
Current for bzr-0.16, 2007-05
19
If you are already familiar with decentralized revision control, then please feel free to skip ahead to "Introducing Yourself to Bazaar-NG". If, on the other hand, you are familiar with revision control but not decentralized revision control, then please start at "How DRCS is different." Otherwise, get some coffee or tea, get comfortable and get ready to catch up.
20
If you are already familiar with decentralized revision control, then
21
please feel free to skip ahead to "Introducing Yourself to Bazaar". If,
22
on the other hand, you are familiar with revision control but not
23
decentralized revision control, then please start at "How DRCS is
24
different." Otherwise, get some coffee or tea, get comfortable and get
21
27
The Purposes of Revision Control
22
28
================================
24
Odds are that you have worked on some sort of textual data -- the sources to a program, web sites or the config files that Unix system administrators have to deal with in /etc. The chances are also good that you have made some sort of mistake that you deeply regretted. Perhaps you deleted the configuration file for your mailserver or perhaps mauled the source code for a pet project. Whatever happened, you have just deleted important information that you would desperately like to get back. If this has ever happened to you, then you are probably ready for Bazaar-NG.
26
Revision control systems (which I'll henceforth call RCS) such as Bazaar-NG give you the ability to track changes for a directory by turning it into something slightly more complicated than a directory that we call a **branch**. The branch not only stores how the directory looks right now, but also how it looked at various points in the past. Then, when you do something you wish you hadn't, you can restore the directory to the way it looked at some point in the past.
28
Revision control systems give users the ability to save changes to a branch by "committing a **revision**". The revision created is essentially a summary of the changes that were made since the last time the tree was saved.
30
These revisions have other uses as well. For example, one can comment revisions to record what the recent set of changes meant by providing an optional log message. Real life log messages include things like "Fixed the web template to close the table" and "Added sftp suppport. Fixes #595"
30
Odds are that you have worked on some sort of textual data -- the sources
31
to a program, web sites or the config files that Unix system
32
administrators have to deal with in /etc. The chances are also good that
33
you have made some sort of mistake that you deeply regretted. Perhaps you
34
deleted the configuration file for your mailserver or perhaps mauled the
35
source code for a pet project. Whatever happened, you have just deleted
36
important information that you would desperately like to get back. If this
37
has ever happened to you, then you are probably ready for Bazaar.
39
Revision control systems (which I'll henceforth call RCS) such as
40
Bazaar give you the ability to track changes for a directory by turning
41
it into something slightly more complicated than a directory that we call
42
a **branch**. The branch not only stores how the directory looks right
43
now, but also how it looked at various points in the past. Then, when you
44
do something you wish you hadn't, you can restore the directory to the way
45
it looked at some point in the past.
47
Revision control systems give users the ability to save changes to a
48
branch by "committing a **revision**". The revision created is essentially
49
a summary of the changes that were made since the last time the tree was
52
These revisions have other uses as well. For example, one can comment
53
revisions to record what the recent set of changes meant by providing an
54
optional log message. Real life log messages include things like "Fixed
55
the web template to close the table" and "Added sftp suppport. Fixes #595"
32
We keep these logs so that if later there is some sort of problem with sftp, we can figure out when the problem probably happened.
57
We keep these logs so that if later there is some sort of problem with
58
sftp, we can figure out when the problem probably happened.
34
60
How DRCS is Different
35
61
---------------------
37
Many Revision Control Systems (RCS) are stored on servers. If one wants to work on the code stored within an RCS, then one needs to connect to the server and "checkout" the code. Doing so gives one a directory in which a person can make changes and then commit. The RCS client then connects to the RCS server and stores the changes. This method is known as the centralized model.
39
The centralized model can have some drawbacks. A centralized RCS requires that one is able to connect to the server whenever one wants to do version control work. This can be a bit of a problem if your server on some other machine on the internet and you are not. Or, worse yet, you ''are'' on the internet but the server is missing!
41
Decentralized Revision Control Systems (which I'll call DRCS after this point) deal with this problem by keeping branches on the same machine as the client. In Bazaar-NG's case, the branch is kept in the same place as the code that is being version controlled. This allows the user to save his changes (**commit**) whenever he wants -- even if he is offline. The user only needs internet access when he wants to access the changes in someone else's branch that are somewhere else.
44
A common requirement that many people have is the need to keep track of the changes for a directory such as file and subdirectory changes. Performing this tracking by hand is a awkward process that over time becomes unwieldy. That is, until one considers version control tools such as Bazaar-NG. These tools automate the process of storing data by creating a **revision** of the directory tree whenever the user asks.
46
Revision control software such as Bazaar-NG can do much more than just storage and performing undo. For example, with Bazaar-NG developer can take the modifications in one branch of software and apply them to another, related, branch -- even if those changes exist in a branch owned by somebody else. This allows developers to cooperate without giving write access to repository.
48
Bazaar-NG remembers the ''ancestry'' of a revision: the previous revisions that it is based upon. A single revision may have more than one direct descendant, each with different changes, representing a divergence in the evolution of the tree. By branching, Bazaar-NG allows multiple people to cooperate on the evolution of a project, without all needing to work in strict lock-step. Branching can be useful even for a single developer.
50
Introducing yourself to Bazaar-NG
51
=================================
53
Bazaar-NG installs a single new command, **bzr**. Everything else is a subcommand of this. You can get some help with `bzr help`. There will be more in the future.
55
One function of a version control system is to keep track of who changed what. In a decentralized system, that requires an identifier for each author that is globally unique. Most people already have one of these: an email address. Bzr is smart enough to automatically generate an email address by looking up your username and hostname. If you don't like the guess that Bazaar-NG makes, then three options exist:
57
1. (**Bazaar-NG 0.6 and later**). Setting the email address in the
58
``~/.bazaar/bazaar.conf`` by adding the following lines. Please note that
59
``[DEFAULT]`` is case sensitive::
62
email= Your Name <email@isp.com>
64
1. (**Bazaar-NG 0.6 and later**) Override the previous setting on a
65
branch by branch basis by creating a branch section in
66
``~/.bazaar/branches.conf`` by adding the following lines::
68
[/the/directory/to/the/branch]
69
email=Your Name <email@isp.com>
71
1. Overriding the two previous options by setting the global environment
72
variable ``$BZREMAIL`` or ``$EMAIL`` (``$BZREMAIL`` will take precedence) to your full email address.
63
Many Revision Control Systems (RCS) are stored on servers. If one wants to
64
work on the code stored within an RCS, then one needs to connect to the
65
server and "checkout" the code. Doing so gives one a directory in which a
66
person can make changes and then commit. The RCS client then connects to
67
the RCS server and stores the changes. This method is known as the
70
The centralized model can have some drawbacks. A centralized RCS requires
71
that one is able to connect to the server whenever one wants to do version
72
control work. This can be a bit of a problem if your server is on some other
73
machine on the internet and you are not. Or, worse yet, you **are** on the
74
internet but the server is missing!
76
Decentralized Revision Control Systems (which I'll call DRCS after this
77
point) deal with this problem by keeping branches on the same machine as
78
the client. In Bazaar's case, the branch is kept in the same place as
79
the code that is being version controlled. This allows the user to save
80
his changes (**commit**) whenever he wants -- even if he is offline. The
81
user only needs internet access when he wants to access the changes in
82
someone else's branch that are somewhere else.
85
A common requirement that many people have is the need to keep track of
86
the changes for a directory such as file and subdirectory changes.
87
Performing this tracking by hand is a awkward process that over time
88
becomes unwieldy. That is, until one considers version control tools such
89
as Bazaar. These tools automate the process of storing data by creating
90
a **revision** of the directory tree whenever the user asks.
92
Revision control software such as Bazaar can do much more than just
93
storage and performing undo. For example, with Bazaar a developer can
94
take the modifications in one branch of software and apply them to a
95
related branch -- even if those changes exist in a branch owned by
96
somebody else. This allows developers to cooperate without giving
97
write access to the repository.
99
Bazaar remembers the ''ancestry'' of a revision: the previous revisions
100
that it is based upon. A single revision may have more than one direct
101
descendant, each with different changes, representing a divergence in the
102
evolution of the tree. By branching, Bazaar allows multiple people to
103
cooperate on the evolution of a project, without all needing to work in
104
strict lock-step. Branching can be useful even for a single developer.
106
Introducing yourself to Bazaar
107
==============================
109
Bazaar installs a single new command, **bzr**. Everything else is a
110
subcommand of this. You can get some help with ``bzr help``. Some arguments
111
are grouped in topics: ``bzr help topics`` to see which topics are available.
112
There will be more in the future.
114
One function of a version control system is to keep track of who changed
115
what. In a decentralized system, that requires an identifier for each
116
author that is globally unique. Most people already have one of these: an
117
email address. Bzr is smart enough to automatically generate an email
118
address by looking up your username and hostname. If you don't like the
119
guess that Bazaar makes, then three options exist:
121
1. Set an email address via ``bzr whoami``. This is the simplest way.
123
To set a global identity, use::
125
% bzr whoami "Your Name <email@example.com>"
127
If you'd like to use a different address for a specific branch, enter
128
the branch folder and use::
130
% bzr whoami --branch "Your Name <email@example.com>"
132
#. Setting the email address in the ``~/.bazaar/bazaar.conf`` [1]_ by
133
adding the following lines. Please note that ``[DEFAULT]`` is case
137
email=Your Name <email@isp.com>
139
As above, you can override this settings on a branch by branch basis
140
by creating a branch section in ``~/.bazaar/locations.conf`` and
141
adding the following lines::
143
[/the/path/to/the/branch]
144
email=Your Name <email@isp.com>
147
#. Overriding the two previous options by setting the global environment
148
variable ``$BZR_EMAIL`` or ``$EMAIL`` (``$BZR_EMAIL`` will take
149
precedence) to your full email address.
151
.. [1] On Windows, the users configuration files can be found in the
152
application data directory. So instead of ``~/.bazaar/branch.conf``
153
the configuration file can be found as:
154
``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0\branch.conf``.
155
The same is true for ``locations.conf``, ``ignore``, and the
156
``plugins`` directory.
77
History is by default stored in the .bzr directory of the branch. There will be a facility to store it in a separate repository, which may be remote. We create a new branch by running **bzr init** in an existing directory::
161
History is by default stored in the .bzr directory of the branch. In a
162
future version of Bazaar, there will be a facility to store it in a
163
separate repository, which may be remote. We create a new branch by
164
running ``bzr init`` in an existing directory::
91
As for CVS, there are three classes of file: unknown, ignored, and versioned. The **add** command makes a file versioned: that is, changes to it will be recorded by the system::
178
As with CVS, there are three classes of file: unknown, ignored, and
179
versioned. The **add** command makes a file versioned: that is, changes
180
to it will be recorded by the system::
93
182
% echo 'hello world' > hello.txt
99
186
% bzr add hello.txt
104
If you add the wrong file, simply use **bzr remove** to make it unversioned again. This does not delete the working copy.
193
If you add the wrong file, simply use ``bzr remove`` to make it
194
unversioned again. This does not delete the working copy in this case,
195
though it may in others [2]_.
197
.. [2] ``bzr remove`` will remove the working copy if it is currently
198
versioned, but has no changes from the last committed version. You
199
can force the file to always be kept with the ``--keep`` option to
200
``bzr remove``, or force it to always be deleted with ``--force``.
109
All history is stored in a branch, which is just an on-disk directory containing control files. By default there is no separate repository or database as used in svn or svk. You can choose to create a repository if you want to (see the **bzr init-repo** command). You may wish to do this if you have very large branches, or many branches of a moderate sized project.
205
All history is stored in a branch, which is just an on-disk directory
206
containing control files. By default there is no separate repository or
207
database as used in svn or svk. You can choose to create a repository if
208
you want to (see the ``bzr init-repo`` command). You may wish to do this
209
if you have very large branches, or many branches of a moderately sized
111
212
You'll usually refer to branches on your computer's filesystem just by
112
213
giving the name of the directory containing the branch. bzr also supports
113
accessing branches over http, for example::
115
% bzr log http://bazaar-ng.org/bzr/bzr.dev/
117
By installing bzr plugins you can also access branches over the sftp or rsync protocols.
214
accessing branches over http and sftp, for example::
216
% bzr log http://bazaar-vcs.org/bzr/bzr.dev/
217
% bzr log sftp://bazaar-vcs.org/bzr/bzr.dev/
219
By installing bzr plugins you can also access branches using the rsync
222
See the `Publishing your branch`_ section for more about how to put your
223
branch at a given location.
119
225
Reviewing changes
120
226
=================
122
Once you have completed some work, you will want to **commit** it to the version history. It is good to commit fairly often: whenever you get a new feature working, fix a bug, or improve some code or documentation. It's also a good practice to make sure that the code compiles and passes its test suite before committing, to make sure that every revision is a known-good state. You can also review your changes, to make sure you're committing what you intend to, and as a chance to rethink your work before you permanently record it.
228
Once you have completed some work, you will want to **commit** it to the
229
version history. It is good to commit fairly often: whenever you get a
230
new feature working, fix a bug, or improve some code or documentation.
231
It's also a good practice to make sure that the code compiles and passes
232
its test suite before committing, to make sure that every revision is a
233
known-good state. You can also review your changes, to make sure you're
234
committing what you intend to, and as a chance to rethink your work before
235
you permanently record it.
124
237
Two bzr commands are particularly useful here: **status** and **diff**.
136
By default **bzr status** hides "boring" files that are either unchanged or ignored. To see them too, use the --all option. The status command can optionally be given the name of some files or directories to check.
249
``bzr status`` hides "boring" files that are either unchanged or ignored.
250
The status command can optionally be given the name of some files or
251
directories to check.
141
The **diff** command shows the full text of changes to all files as a standard unified diff. This can be piped through many programs such as ''patch'', ''diffstat'', ''filterdiff'' and ''colordiff''::
256
The **diff** command shows the full text of changes to all files as a
257
standard unified diff. This can be piped through many programs such as
258
''patch'', ''diffstat'', ''filterdiff'' and ''colordiff''::
144
*** added file 'hello.txt'
261
=== added file 'hello.txt'
262
--- hello.txt 1970-01-01 00:00:00 +0000
263
+++ hello.txt 2005-10-18 14:23:29 +0000
151
With the ''-r'' option, the tree is compared to an earlier revision, or
268
With the ``-r`` option, the tree is compared to an earlier revision, or
152
269
the differences between two versions are shown::
154
271
% bzr diff -r 1000.. # everything since r1000
155
272
% bzr diff -r 1000..1100 # changes from 1000 to 1100
157
The --diff-options option causes bzr to run the external diff program,
274
The ``--diff-options`` option causes bzr to run the external diff program,
158
275
passing options. For example::
160
277
% bzr diff --diff-options --side-by-side foo
279
Some projects prefer patches to show a prefix at the start of the path
280
for old and new files. The ``--prefix`` option can be used to provide
282
As a shortcut, ``bzr diff -p1`` produces a form that works with the
283
command ``patch -p1``.
162
285
Committing changes
163
286
==================
165
When the working tree state is satisfactory, it can be **committed** to the branch, creating a new revision holding a snapshot of that state.
288
When the working tree state is satisfactory, it can be **committed** to
289
the branch, creating a new revision holding a snapshot of that state.
170
The **commit** command takes a message describing the changes in the revision. It also records your userid, the current time and timezone, and the inventory and contents of the tree. The commit message is specified by the ''-m'' or ''--message'' option. You can enter a multi-line commit message; in most shells you can enter this just by leaving the quotes open at the end of the line.
294
The **commit** command takes a message describing the changes in the
295
revision. It also records your userid, the current time and timezone, and
296
the inventory and contents of the tree. The commit message is specified
297
by the ``-m`` or ``--message`` option. You can enter a multi-line commit
298
message; in most shells you can enter this just by leaving the quotes open
299
at the end of the line.
174
303
% bzr commit -m "added my first file"
176
You can also use the -F option to take the message from a file. Some people like to make notes for a commit message while they work, then review the diff to make sure they did what they said they did. (This file can also be useful when you pick up your work after a break.)
305
You can also use the ``-F`` option to take the message from a file. Some
306
people like to make notes for a commit message while they work, then
307
review the diff to make sure they did what they said they did. (This file
308
can also be useful when you pick up your work after a break.)
178
310
Message from an editor
179
311
======================
181
If you use neither the `-m` nor the `-F` option then bzr will open an editor for you to enter a message. The editor to run is controlled by your `$EDITOR` environment variable or (Post Bazaar-NG 0.6) email setting in . If you quit the editor without making any changes, the commit will be cancelled.
313
If you use neither the ``-m`` nor the ``-F`` option then bzr will open an
314
editor for you to enter a message. The editor to run is controlled by
315
your ``$VISUAL`` or ``$EDITOR`` environment variable, which can be overridden
316
by the ``editor`` setting in ``~/.bazaar/bazaar.conf``; ``$BZR_EDITOR`` will
317
override either of the above mentioned editor options. If you quit the
318
editor without making any changes, the commit will be cancelled.
214
361
If a glob contains a slash, it is matched against the whole path from the
215
362
top of the tree; otherwise it is matched against only the filename. So
216
363
the previous example ignores files with extension ``.o`` in all
217
subdirectories, but this example ignores only config.h at the top level
364
subdirectories, but this example ignores only ``config.h`` at the top level
218
365
and HTML files in ``doc/``::
223
To get a list of which files are ignored and what pattern they matched, use ''bzr ignored''::
370
To get a list of which files are ignored and what pattern they matched,
371
use ``bzr ignored``::
226
374
config.h ./config.h
229
It is OK to have either an ignore pattern match a versioned file, or to add an ignored file. Ignore patterns have no effect on versioned files; they only determine whether unversioned files are reported as unknown or ignored.
377
It is OK to have either an ignore pattern match a versioned file, or to
378
add an ignored file. Ignore patterns have no effect on versioned files;
379
they only determine whether unversioned files are reported as unknown or
231
The ''.bzrignore'' file should normally be versioned, so that new copies of the branch see the same patterns::
382
The ``.bzrignore`` file should normally be versioned, so that new copies
383
of the branch see the same patterns::
233
385
% bzr add .bzrignore
234
386
% bzr commit -m "Add ignore patterns"
392
There are some ignored files which are not project specific, but more user
393
specific. Things like editor temporary files, or personal temporary files.
394
Rather than add these ignores to every project, bzr supports a global
395
ignore file in ``~/.bazaar/ignore`` [1]_. It has the same syntax as the
396
per-project ignore file.
237
399
Examining history
238
400
=================
243
The **bzr log** command shows a list of previous revisions. The **bzr log --forward** command does the same in chronological order to get most recent revisions printed at last.
405
The ``bzr log`` command shows a list of previous revisions. The ``bzr log
406
--forward`` command does the same in chronological order to get most
407
recent revisions printed at last.
245
As with bzr diff, bzr log supports the -r argument::
409
As with ``bzr diff``, ``bzr log`` supports the ``-r`` argument::
247
411
% bzr log -r 1000.. # Revision 1000 and everything after it
248
% bzr log -r ..1000 # Everything up to and including revision % 1000
412
% bzr log -r ..1000 # Everything up to and including r1000
249
413
% bzr log -r 1000..1100 # changes from 1000 to 1100
250
414
% bzr log -r 1000 # The changes in only revision 1000
321
504
Merging from related branches
322
505
=============================
324
If two branches have diverged (both have unique changes) then **bzr merge** is the appropriate command to use. Merge will automatically calculate the changes that exist in the branch you're merging from that are not in your branch and attempt to apply them in your branch.
507
If two branches have diverged (both have unique changes) then ``bzr
508
merge`` is the appropriate command to use. Merge will automatically
509
calculate the changes that exist in the branch you're merging from that
510
are not in your branch and attempt to apply them in your branch.
331
If there is a conflict during a merge, 3 files with the same basename are created. The filename of the common base is appended with .BASE, the filename of the file containing your changes is appended .THIS and the filename with the changes from the other tree is appended .OTHER.
332
Using a program such as kdiff3, you can now comfortably merge them into one file. To commit you have to rename it to the original basename and delete the other two files. As long as there exist files with .BASE, .THIS or .OTHER the commit command will complain.
517
If there is a conflict during a merge, 3 files with the same basename
518
are created. The filename of the common base is appended with ".BASE",
519
the filename of the file containing your changes is appended with
520
".THIS" and the filename with the changes from the other tree is
521
appended with ".OTHER". Using a program such as kdiff3, you can now
522
comfortably merge them into one file. In order to commit you have to
523
rename the merged file (".THIS") to the original file name. To
524
complete the conflict resolution you must use the resolve command,
525
which will remove the ".OTHER" and ".BASE" files. As long as there
526
exist files with .BASE, .THIS or .OTHER the commit command will
531
% kdiff3 file.BASE file.OTHER file.THIS
334
535
[**TODO**: explain conflict markers within files]
337
538
Publishing your branch
338
539
======================
339
You don't need a special server to publish a bzr branch, just a normal web server. Just mirror the files to your server, including the .bzr directory. One can push a branch (or the changes for a branch) by one of the following three methods:
341
* Rsync: rsync -avrz LOCALBRANCH servername.com/this/directory/here
342
* (Post 0.6): bzr push sftp://servername.com/this/directory/here (sftp://servername.com/this/directory/ must already exist)
343
* The push plugin that comes with BzrTools
541
You don't need a special server to publish a bzr branch, just a normal web
542
server. Just mirror the files to your server, including the .bzr
543
directory. One can push a branch (or the changes for a branch) by one of
544
the following three methods:
546
* The best method is to use bzr itself to do it.
550
% bzr push sftp://servername.com/path/to/directory
552
(The destination directory must already exist unless the
553
``--create-prefix`` option is used.)
555
* Another option is the ``rspush`` plugin that comes with BzrTools, which
556
uses rsync to push the changes to the revision history and the working
559
You can also use copy the files around manually, by sending a tarball, or
560
using rsync, or other related file transfer methods. This is usually
561
less safe than using ``push``, but may be faster or easier in some
564
Moving changes between trees
565
============================
567
It happens to the best of us: sometimes you'll make changes in the wrong
568
tree. Maybe because you've accidentally started work in the wrong directory,
569
maybe because as you're working, the change turns out to be bigger than you
570
expected, so you start a new branch for it.
572
To move your changes from one tree to another, use
577
% bzr merge --uncommitted OLDDIR
579
This will apply all of the uncommitted changes you made in OLDDIR to NEWDIR.
580
It will not apply committed changes, even if they could be applied to NEWDIR
581
with a regular merge. The changes will remain in OLDDIR, but you can use ``bzr
582
revert OLDDIR`` to remove them, once you're satisfied with NEWDIR.
584
NEWDIR does not have to be a copy of OLDDIR, but they should be related.
585
The more different they are, the greater the chance of conflicts.
added
removed
doc/tutorial.txt
