Bazaar

Merge lp://staging/~nmb/bzr/fix-249919 into lp://staging/bzr

  1. fix-249919
  2. Merge into bzr.dev
Proposed by Neil Martinsen-Burrell
Status: Merged
Approved by: Ian Clatworthy
Approved revision: not available
Merged at revision: not available
Proposed branch: lp://staging/~nmb/bzr/fix-249919
Merge into: lp://staging/bzr
Diff against target: 32 lines (+12/-0)
2 files modified
bzrlib/builtins.py (+4/-0)
doc/en/user-guide/reviewing_changes.txt (+8/-0)
To merge this branch: bzr merge lp://staging/~nmb/bzr/fix-249919
Reviewer Review Type Date Requested Status
Martin Pool Approve
Review via email: mp+15161@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

This includes the -c option to diff in both the help and the User Guide.

Revision history for this message
Martin Pool (mbp) wrote :

Thanks

review: Approve
Revision history for this message
Robert Collins (lifeless) wrote :

review: approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/builtins.py'
2--- bzrlib/builtins.py 2009-11-23 00:57:38 +0000
3+++ bzrlib/builtins.py 2009-11-23 15:50:36 +0000
4@@ -1850,6 +1850,10 @@
5
6 bzr diff -r<chosen_parent>..X
7
8+ The changes introduced by revision 2 (equivalent to -r1..2)::
9+
10+ bzr diff -c2
11+
12 Show just the differences for file NEWS::
13
14 bzr diff NEWS
15
16=== modified file 'doc/en/user-guide/reviewing_changes.txt'
17--- doc/en/user-guide/reviewing_changes.txt 2007-11-21 07:39:16 +0000
18+++ doc/en/user-guide/reviewing_changes.txt 2009-11-23 15:50:36 +0000
19@@ -45,6 +45,14 @@
20 % bzr diff -r 1000.. # everything since r1000
21 % bzr diff -r 1000..1100 # changes from 1000 to 1100
22
23+To see the changes introduced by a single revision, you can use the ``-c``
24+option to diff.
25+
26+::
27+
28+ % bzr diff -c 1000 # changes from r1000
29+ # identical to -r999..1000
30+
31 The ``--diff-options`` option causes bzr to run the external diff program,
32 passing options. For example::
33