← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/reviewing_changes.txt

  • Committer: John Arbash Meinel
  • Date: 2009-12-02 23:09:40 UTC
  • mfrom: (4853.1.1 whitespace)
  • mto: This revision was merged to the branch mainline in revision 4856.
  • Revision ID: john@arbash-meinel.com-20091202230940-7n2aydoxngdqxzld
Strip trailing whitespace from doc files by Patrick Regan.

Resolve one small conflict with another doc edit.
Also, revert the changes to all the .pdf and .png files. We shouldn't
be touching them as they are pure-binary files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/reviewing_changes.txt
8
8
prior to permanently recording it. This way, you can make sure you'll be
9
9
committing what you intend to.
10
10
 
11
 
Two bzr commands are particularly useful here: **status** and **diff**.  
 
11
Two bzr commands are particularly useful here: **status** and **diff**.
12
12
 
13
13
bzr status
14
14
----------
49
49
option to diff.
50
50
 
51
51
::
52
 
 
 
52
 
53
53
    % bzr diff -c 1000            # changes from r1000
54
54
                                  # identical to -r999..1000
55
55
 
61
61
Some projects prefer patches to show a prefix at the start of the path
62
62
for old and new files.  The ``--prefix`` option can be used to provide
63
63
such a prefix.
64
 
As a shortcut, ``bzr diff -p1`` produces a form that works with the 
 
64
As a shortcut, ``bzr diff -p1`` produces a form that works with the
65
65
command ``patch -p1``.
66
66