[MERGE][bug #6700] diff on branches without working trees

Ian Clatworthy ian.clatworthy at internode.on.net
Tue Dec 4 06:58:55 GMT 2007


Aaron Bentley wrote:
> Ian Clatworthy wrote:
>> It also lets you compare two tree-less branches and apply a filter of
>> specific files to that comparison if you wish.
> 
> bb:resubmit
> 
> I'm not really comfortable with the way you're mixing branches and files
> in the same argument set.  To me, it seems like if we don't name the
> file as part of the branch (e.g.
> http://bazaar-vcs.org/bzr/bzr.dev/Makefile), we should have some way of
> delimiting files from branches.

Updated patch attached based on Aaron's feedback. I've introduced two
new options (--old and --new) that make it more explicit as to what is
being compared. I think this ought to keep most users happy in that we
want to expose the functionality now - increased DWIM can come later. It
also ended up simplifying the code quite a bit.

FWIW, I have a slight preference for --old and --new to be called --from
and --to. In the end, I went with --old and --new to help svn refugees.
There's not much difference in usability and it didn't seem worth being
different for the sake for it.

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: better-diff-2.patch
Type: text/x-patch
Size: 25932 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071204/54b4dc0e/attachment-0001.bin 


More information about the bazaar mailing list