← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-07-12 15:13:59 UTC
  • mfrom: (1850.1.2 diff-6391)
  • Revision ID: pqm@pqm.ubuntu.com-20060712151359-b22a8c043fa52eb7
(jam) update help text for diff (bug #6391)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1078
1078
 
1079
1079
 
1080
1080
class cmd_diff(Command):
1081
 
    """Show differences in working tree.
 
1081
    """Show differences in the working tree or between revisions.
1082
1082
    
1083
1083
    If files are listed, only the changes in those files are listed.
1084
1084
    Otherwise, all changes for the tree are listed.
1088
1088
 
1089
1089
    examples:
1090
1090
        bzr diff
 
1091
            Shows the difference in the working tree versus the last commit
1091
1092
        bzr diff -r1
 
1093
            Difference between the working tree and revision 1
1092
1094
        bzr diff -r1..2
 
1095
            Difference between revision 2 and revision 1
1093
1096
        bzr diff --diff-prefix old/:new/
 
1097
            Same as 'bzr diff' but prefix paths with old/ and new/
1094
1098
        bzr diff bzr.mine bzr.dev
 
1099
            Show the differences between the two working trees
1095
1100
        bzr diff foo.c
 
1101
            Show just the differences for 'foo.c'
1096
1102
    """
1097
1103
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1098
1104
    #       or a graphical diff.