rfc: 'bzr compare' command
John A Meinel
john at arbash-meinel.com
Mon Jul 25 23:08:31 BST 2005
Martin Pool wrote:
> I'd like to add a command like this:
>
> bzr compare [BRANCH1 [BRANCH2]]
>
> which shows what revisions are present in one but not in the other. The
> output will be similar to running bzr log twice, showing respectively
> things in branch1 but not branch2, and vice versa.
>
> This could be used before merging or updating from another branch.
>
> Any comments/problems?
>
Isn't this basically what I wrote as "bzr missing"? I realize you didn't
prefer the name.
And we should be specific about what:
bzr compare
bzr compare BRANCH1
bzr compare B1 B2
do.
I personally think "bzr compare" should compare the current working tree
with 'x-pull'.
"bzr compare B1" should compare the current tree with the branch
specified, and
bzr compare B1 B2 uses B1 instead of the local branch. So:
bzr compare . B2
is the same as
bzr compare B2
I guess my "bzr missing" only said what was missing in this that was
present in other, and your "bzr compare" is trying to do both ways at once.
My only concern is that it be obvious which one is presented when.
(Probably just in order is okay.)
Also, will you compare their complete revision ancestry, or just
revision-history?
If I merge your branch, you need to look at the ancestry. But ancestry
might be missing (as is the case of the current bzr mainline tree).
I guess I would suggest a hybrid. Only 'revision-history' can be
missing, but it is present if it exists in the ancestry. Otherwise you
can't use simple revision numbers to reference the logs.
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/20050725/7616d0ef/attachment.pgp
More information about the bazaar
mailing list