How to get the diff between two arbitrary remote revisions?

[John A Meinel]

Matthieu Moy wrote:
> Martin Pool <mbp at sourcefrog.net> writes:
> 
>> The two are distinct for these stereotypical cases.  There are some
>> in-between cases that are harder to determine; should I be able to diff
>>  particular subdirectories or files from different branches?  Perhaps
>> the behaviour should be that if there are two arguments and they are in
>> different branches then we diff between those two, rather than against
>> their individual history.
> 
> My feeling is that this makes the spec very confusing, just to save a
> "-r branch:". I'd rather avoid this kind of specification which look
> to me like a heuristic ("type something, and I'll try to understand
> what you meant").
> 
> (and this doesn't solve my initial problem. It's just a shortcut for
> an existing syntax, whereas my problem is that there is _no_ syntax at
> all to specify a revision which is not the latest in a remote branch)
> 

Actually, it would solve that with:

bzr diff -r 100..-1 ../other/branch .

Which would compute the difference between the other branch's revno=100,
and the last commit to the local branch.

You could also argue that:

bzr diff -r 100.. ../other/branch .

Might do the diff against the working tree.

Otherwise, I would use something like:

bzr diff -r branch:10:/other/branch .

But you have to watch out for windows, where you have:

bzr diff -r branch:c:/other/branch .

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051108/719b927f/attachment.pgp