Bug? how to obtain diff between current file content and some revision?

Alexander Belchenko bialix at ukr.net
Sun Nov 27 18:14:00 GMT 2005


John A Meinel пишет:
>>Is this exist simple way to obtain diff between current file content
>>(not last revision) and some past revision?
> 
> Well, you can do just:
> 
> bzr diff -rN FILENAME
> 
> And it will do the diff against the working tree, versus the specified
> revision.

Thanks, it's working. It seems that examples in help for diff is not 
clear for me. I was use open range in diff as in status command. May be 
for diff command open range can print warning or error to user.

E:\work\Python\bzr\test\diff>bzr diff -h
usage: bzr diff [FILE...]
aliases: di, dif

Show differences in working tree.

If files are listed, only the changes in those files are listed.
Otherwise, all changes for the tree are listed.

examples:
     bzr diff
     bzr diff -r1
     bzr diff -r1..2

options:
     --diff-options ARG
     --help, -h                show help message
     --revision ARG, -r


May be there is need to add explaining comments to examples? Like this:

     bzr diff            show difference between last revision and 
working tree
     bzr diff -r1        show difference between revision 1 and working tree
     bzr diff -r1..2     show difference between revisions 1 and 2


What is `diff-options' option?

Alexander




More information about the bazaar mailing list