/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
1
Reviewing changes
2
=================
3
4
Looking before you leap
5
-----------------------
6
7
Once you have completed some work, it's a good idea to review your changes
8
prior to permanently recording it. This way, you can make sure you'll be
9
committing what you intend to.
10
6622.1.24 by Jelmer Vernooij
More doc renames.
11
Two brz commands are particularly useful here: **status** and **diff**.
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
12
6622.1.24 by Jelmer Vernooij
More doc renames.
13
brz status
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
14
----------
15
16
The **status** command tells you what changes have been made to the
17
working directory since the last revision::
18
6622.1.24 by Jelmer Vernooij
More doc renames.
19
    % brz status
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
20
    modified:
21
       foo
22
6622.1.24 by Jelmer Vernooij
More doc renames.
23
``brz status`` hides "boring" files that are either unchanged or ignored.
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
24
The status command can optionally be given the name of some files or
25
directories to check.
26
6622.1.24 by Jelmer Vernooij
More doc renames.
27
brz diff
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
28
--------
29
30
The **diff** command shows the full text of changes to all files as a
31
standard unified diff.  This can be piped through many programs such as
32
''patch'', ''diffstat'', ''filterdiff'' and ''colordiff''::
33
6622.1.24 by Jelmer Vernooij
More doc renames.
34
    % brz diff
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
35
    === added file 'hello.txt'
36
    --- hello.txt   1970-01-01 00:00:00 +0000
37
    +++ hello.txt   2005-10-18 14:23:29 +0000
38
    @@ -0,0 +1,1 @@
39
    +hello world
40
41
42
With the ``-r`` option, the tree is compared to an earlier revision, or
43
the differences between two versions are shown::
44
6622.1.24 by Jelmer Vernooij
More doc renames.
45
    % brz diff -r 1000..          # everything since r1000
46
    % brz diff -r 1000..1100      # changes from 1000 to 1100
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
47
4798.2.2 by Neil Martinsen-Burrell
Add diff -c to the User Guide
48
To see the changes introduced by a single revision, you can use the ``-c``
49
option to diff.
50
51
::
4853.1.1 by Patrick Regan
Removed trailing whitespace from files in doc directory
52
6622.1.24 by Jelmer Vernooij
More doc renames.
53
    % brz diff -c 1000            # changes from r1000
4798.2.2 by Neil Martinsen-Burrell
Add diff -c to the User Guide
54
                                  # identical to -r999..1000
55
6622.1.24 by Jelmer Vernooij
More doc renames.
56
The ``--diff-options`` option causes brz to run the external diff program,
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
57
passing options.  For example::
58
6622.1.24 by Jelmer Vernooij
More doc renames.
59
    % brz diff --diff-options --side-by-side foo
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
60
61
Some projects prefer patches to show a prefix at the start of the path
62
for old and new files.  The ``--prefix`` option can be used to provide
63
such a prefix.
6622.1.24 by Jelmer Vernooij
More doc renames.
64
As a shortcut, ``brz diff -p1`` produces a form that works with the
2977.1.3 by Ian Clatworthy
1st cut at the 'Personal version control' chapter
65
command ``patch -p1``.
66