diff support for two revisions patch

John A Meinel john at arbash-meinel.com
Thu Aug 4 23:22:00 BST 2005


Martin Pool wrote:
> On  4 Aug 2005, Felix Berger <bflat1 at gmx.net> wrote:
>
>>Hi,
>>
>>the attached patch enables bzr diff to take two revisions for a comparison
>>between them.
>
>
> Thanks for the patch, but this seems to break plain diff with no -r
> option.
>

Actually, if you look through the mailing lists, there have been quite a
few patches to make diff support multiple options. I think I might have
even submitted one myself. :)

Actually, for my use case, I updated my changeset plugin so that "bzr
cset -r 10" gives the changeset for revno 10 versus it's parent. Which
is what I really wanted ranges for.

But since "bzr diff -r a..b" has been requested numerous times, I would
recommend that we implement something. My personal preference is to just
hand show_diff the revision object (which is either None or a list), and
have show_diff figure out how to handle it.

I would also like to see "bzr diff -r ..10" show the different between
revno 9 and 10, and bzr diff -r 9.. show the diff between 9 and the last
committed entry.

I suppose in general, we need a consistent meaning for what a missing
revision means. Or can it be command specific? For instance "bzr log -r
..10" to me means give me from 1-10, not 9-10, but "bzr diff -r ..10"
would imply 9.

Do you prefer consistency, or a more intuitive approach? I prefer the
intuitive, as the reason I don't want to type "bzr diff -r9..10" is
because I don't want to have to worry about a bunch of extra numbers
when it is revno 1000.
I suppose of the two possible meanings, having "bzr log -r ..10" mean
9-10 is better than the reverse, because 1 is easy to type to mean the
beginning of the range.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050804/9dcc1aef/attachment.pgp 


More information about the bazaar mailing list