70
70
The centralized model can have some drawbacks. A centralized RCS requires
71
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
72
control work. This can be a bit of a problem if your server on some other
73
machine on the internet and you are not. Or, worse yet, you ''are'' on the
74
74
internet but the server is missing!
76
76
Decentralized Revision Control Systems (which I'll call DRCS after this
90
90
a **revision** of the directory tree whenever the user asks.
92
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.
93
storage and performing undo. For example, with Bazaar developer can
94
take the modifications in one branch of software and apply them to
95
another, related, branch -- even if those changes exist in a branch owned
96
by somebody else. This allows developers to cooperate without giving write
99
99
Bazaar remembers the ''ancestry'' of a revision: the previous revisions
100
100
that it is based upon. A single revision may have more than one direct
107
107
==============================
109
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.
110
subcommand of this. You can get some help with `bzr help`. There will be
114
113
One function of a version control system is to keep track of who changed
115
114
what. In a decentralized system, that requires an identifier for each
119
118
guess that Bazaar makes, then three options exist:
121
120
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.
121
To set a global identity, use::
123
% bzr whoami 'Your Name <email@example.com>'
125
If you'd like to use a different address for a specific branch, enter
126
the branch folder and use::
128
% bzr whoami --branch 'Your Name <email@example.com>'
130
1. Setting the email address in the
131
``~/.bazaar/bazaar.conf`` [1]_ by adding the following lines. Please note that
132
``[DEFAULT]`` is case sensitive::
135
email= Your Name <email@isp.com>
137
As above, you can override this settings on a branch by branch basis by
138
creating a branch section in ``~/.bazaar/locations.conf`` and adding the
141
[/the/directory/to/the/branch]
142
email=Your Name <email@isp.com>
144
1. Overriding the two previous options by setting the global environment
145
variable ``$BZREMAIL`` or ``$EMAIL`` (``$BZREMAIL`` will take precedence)
146
to your full email address.
151
148
.. [1] On Windows, the users configuration files can be found in the
152
149
application data directory. So instead of ``~/.bazaar/branch.conf``
158
155
Creating a branch
159
156
=================
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::
158
History is by default stored in the .bzr directory of the branch. There
159
will be a facility to store it in a separate repository, which may be
160
remote. We create a new branch by running **bzr init** in an existing
178
As with CVS, there are three classes of file: unknown, ignored, and
175
As for CVS, there are three classes of file: unknown, ignored, and
179
176
versioned. The **add** command makes a file versioned: that is, changes
180
177
to it will be recorded by the system::
186
185
% bzr add hello.txt
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``.
190
If you add the wrong file, simply use **bzr remove** to make it
191
unversioned again. This does not delete the working copy.
205
196
All history is stored in a branch, which is just an on-disk directory
206
197
containing control files. By default there is no separate repository or
207
198
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
199
you want to (see the **bzr init-repo** command). You may wish to do this
200
if you have very large branches, or many branches of a moderate sized
212
203
You'll usually refer to branches on your computer's filesystem just by
213
204
giving the name of the directory containing the branch. bzr also supports
214
accessing branches over http and sftp, for example::
205
accessing branches over http, for example::
216
207
% 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.
209
By installing bzr plugins you can also access branches over the sftp or
225
212
Reviewing changes
226
213
=================
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.
236
By default **bzr status** hides "boring" files that are either unchanged
237
or ignored. To see them too, use the --all option. The status command
238
can optionally be given the name of some files or directories to check.
258
245
''patch'', ''diffstat'', ''filterdiff'' and ''colordiff''::
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
248
*** added file 'hello.txt'
268
With the ``-r`` option, the tree is compared to an earlier revision, or
255
With the ''-r'' option, the tree is compared to an earlier revision, or
269
256
the differences between two versions are shown::
271
258
% bzr diff -r 1000.. # everything since r1000
272
259
% bzr diff -r 1000..1100 # changes from 1000 to 1100
274
The ``--diff-options`` option causes bzr to run the external diff program,
261
The --diff-options option causes bzr to run the external diff program,
275
262
passing options. For example::
277
264
% 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
266
Some projects prefer patches to show a prefix at the start of the path for
267
old and new files. The --prefix option can be used to provide such a prefix.
282
268
As a shortcut, ``bzr diff -p1`` produces a form that works with the
283
269
command ``patch -p1``.
294
280
The **commit** command takes a message describing the changes in the
295
281
revision. It also records your userid, the current time and timezone, and
296
282
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
283
by the ''-m'' or ''--message'' option. You can enter a multi-line commit
298
284
message; in most shells you can enter this just by leaving the quotes open
299
285
at the end of the line.
303
289
% bzr commit -m "added my first file"
305
You can also use the ``-F`` option to take the message from a file. Some
291
You can also use the -F option to take the message from a file. Some
306
292
people like to make notes for a commit message while they work, then
307
293
review the diff to make sure they did what they said they did. (This file
308
294
can also be useful when you pick up your work after a break.)
310
296
Message from an editor
311
297
======================
313
If you use neither the ``-m`` nor the ``-F`` option then bzr will open an
299
If you use neither the `-m` nor the `-F` option then bzr will open an
314
300
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.
320
The file that is opened in the editor contains a horizontal line. The part
321
of the file below this line is included for information only, and will not
322
form part of the commit message. Below the separator is shown the list of
323
files that are changed in the commit. You should write your message above
324
the line, and then save the file and exit.
326
If you would like to see the diff that will be committed as you edit the
327
message you can use the ``--show-diff`` option to ``commit``. This will include
328
the diff in the editor when it is opened, below the separator and the
329
information about the files that will be committed. This means that you can
330
read it as you write the message, but the diff itself wont be seen in the
331
commit message when you have finished. If you would like parts to be
332
included in the message you can copy and paste them above the separator.
301
your `$EDITOR` environment variable or
302
add `editor` to ~/.bazaar/bazaar.conf; `$BZR_EDITOR` will override
303
the above mentioned editor options. If you quit the editor without
304
making any changes, the commit will be cancelled.
351
323
If you've made some changes and don't want to keep them, use the
352
324
**revert** command to go back to the previous head version. It's a good
353
idea to use ``bzr diff`` first to see what will be removed. By default the
325
idea to use **bzr diff** first to see what will be removed. By default the
354
326
revert command reverts the whole tree; if file or directory names are
355
given then only those ones will be affected. ``bzr revert`` also clears the
327
given then only those ones will be affected. **revert** also clears the
356
328
list of pending merges revisions.
362
334
such as editor backups, object or bytecode files, and built programs. You
363
335
can simply not add them, but then they'll always crop up as unknown files.
364
336
You can also tell bzr to ignore these files by adding them to a file
365
called ``.bzrignore`` at the top of the tree.
337
called ''.bzrignore'' at the top of the tree.
367
339
This file contains a list of file wildcards (or "globs"), one per line.
368
340
Typical contents are like this::
375
347
If a glob contains a slash, it is matched against the whole path from the
376
348
top of the tree; otherwise it is matched against only the filename. So
377
349
the previous example ignores files with extension ``.o`` in all
378
subdirectories, but this example ignores only ``config.h`` at the top level
350
subdirectories, but this example ignores only config.h at the top level
379
351
and HTML files in ``doc/``::
384
356
To get a list of which files are ignored and what pattern they matched,
385
use ``bzr ignored``::
357
use ''bzr ignored''::
388
360
config.h ./config.h
419
The ``bzr log`` command shows a list of previous revisions. The ``bzr log
420
--forward`` command does the same in chronological order to get most
391
The **bzr log** command shows a list of previous revisions. The **bzr log
392
--forward** command does the same in chronological order to get most
421
393
recent revisions printed at last.
423
As with ``bzr diff``, ``bzr log`` supports the ``-r`` argument::
395
As with bzr diff, bzr log supports the -r argument::
425
397
% bzr log -r 1000.. # Revision 1000 and everything after it
426
398
% bzr log -r ..1000 # Everything up to and including r1000
458
430
You can delete files or directories by just deleting them from the working
459
431
directory. This is a bit different to CVS, which requires that you also
462
``bzr remove`` makes the file un-versioned, but may or may not delete
463
the working copy [2]_. This is useful when you add the wrong file,
464
or decide that a file should actually not be versioned.
434
**bzr remove** makes the file un-versioned, but does not delete
435
the working copy. This is useful when you add the wrong file, or decide
436
that a file should actually not be versioned.
486
458
Often rather than starting your own project, you will want to submit a
487
change to an existing project. To do this, you'll need to get a copy of
488
the existing branch. Because this new copy is potentially a new branch,
489
the command is called **branch**::
459
change to an existing project. You can get a copy of an existing branch
460
by copying its directory, expanding a tarball, or by a remote copy using
461
something like rsync. You can also use bzr to fetch a copy. Because this
462
new copy is potentially a new branch, the command is called *branch*::
491
464
% bzr branch http://bazaar-vcs.org/bzr/bzr.dev
495
468
operations on it locally: log, annotate, making and merging branches.
496
469
There will be an option to get only part of the history if you wish.
498
You can also get a copy of an existing branch by copying its directory,
499
expanding a tarball, or by a remote copy using something like rsync.
501
471
Following upstream changes
502
472
==========================
518
488
Merging from related branches
519
489
=============================
521
If two branches have diverged (both have unique changes) then ``bzr
522
merge`` is the appropriate command to use. Merge will automatically
491
If two branches have diverged (both have unique changes) then **bzr
492
merge** is the appropriate command to use. Merge will automatically
523
493
calculate the changes that exist in the branch you're merging from that
524
494
are not in your branch and attempt to apply them in your branch.
531
If there is a conflict during a merge, 3 files with the same basename
532
are created. The filename of the common base is appended with ".BASE",
533
the filename of the file containing your changes is appended with
534
".THIS" and the filename with the changes from the other tree is
535
appended with ".OTHER". Using a program such as kdiff3, you can now
536
comfortably merge them into one file. In order to commit you have to
537
rename the merged file (".THIS") to the original file name. To
538
complete the conflict resolution you must use the resolve command,
539
which will remove the ".OTHER" and ".BASE" files. As long as there
540
exist files with .BASE, .THIS or .OTHER the commit command will
545
% kdiff3 file.BASE file.OTHER file.THIS
501
If there is a conflict during a merge, 3 files with the same basename are
502
created. The filename of the common base is appended with .BASE, the
503
filename of the file containing your changes is appended .THIS and the
504
filename with the changes from the other tree is appended .OTHER.
505
Using a program such as kdiff3, you can now comfortably merge them into
506
one file. To commit you have to rename it to the original basename and
507
delete the other two files. As long as there exist files with .BASE, .THIS
508
or .OTHER the commit command will complain.
549
510
[**TODO**: explain conflict markers within files]
557
518
directory. One can push a branch (or the changes for a branch) by one of
558
519
the following three methods:
560
* The best method is to use bzr itself to do it.
564
% bzr push sftp://servername.com/path/to/directory
566
(The destination directory must already exist unless the
567
``--create-prefix`` option is used.)
569
* Another option is the ``rspush`` plugin that comes with BzrTools, which
570
uses rsync to push the changes to the revision history and the working
573
You can also use copy the files around manually, by sending a tarball, or
574
using rsync, or other related file transfer methods. This is usually
575
less safe than using ``push``, but may be faster or easier in some
521
* Rsync: rsync -avrz LOCALBRANCH servername.com/this/directory/here
523
(or any other tool for publishing a directory to a web site.)
525
* bzr push sftp://servername.com/this/directory/here
527
(The directory that must already exist)
529
* The rspush plugin that comes with BzrTools
578
532
Moving changes between trees
579
533
============================
593
547
This will apply all of the uncommitted changes you made in OLDDIR to NEWDIR.
594
548
It will not apply committed changes, even if they could be applied to NEWDIR
595
with a regular merge. The changes will remain in OLDDIR, but you can use ``bzr
596
revert OLDDIR`` to remove them, once you're satisfied with NEWDIR.
549
with a regular merge. The changes will remain in OLDDIR, but you can use **bzr
550
revert OLDDIR** to remove them, once you're satisfied with NEWDIR.
598
552
NEWDIR does not have to be a copy of OLDDIR, but they should be related.
599
553
The more different they are, the greater the chance of conflicts.
added
removed
doc/tutorial.txt
