How to get the diff between two arbitrary remote revisions?

[John A Meinel]

Jan Hudec wrote:
> On Wed, Nov 16, 2005 at 07:06:51 -0600, John A Meinel wrote:
>> Jan Hudec wrote:
>>> On Tue, Nov 15, 2005 at 23:02:48 -0500, Aaron Bentley wrote:
>>>> -----BEGIN PGP SIGNED MESSAGE-----
>>>> Hash: SHA1
>>>>
>>>> Robey Pointer wrote:
>>>> | All I really meant was:
>>>> |
>>>> | I don't think -r should let you shunt across to a different branch  from
>>>> | the branch currently in context.
>>>> |
>>>> | AIUI, "-r revid:bar" will only look up the revision in the current-
>>>> | context branch
>>>>
>>>> No, revid is completely context-independent.  It's a universally unique
>>>> identifier.  You can specify any revision id you like.  Of course, if
>>>> it's not stored in your branch, the operation isn't likely to succeed.
>>>> But it's quite common for a branch to store revisions that aren't
>>>> ancestors of the latest revision.  Happens every time you merge.
>>> It's not common. It only happens when you have a *PENDING* merge.
>>> Becase once you commit, they become ancestors of the current revision.
>>>
>>> --
>>> 						 Jan 'Bulb' Hudec <bulb at ucw.cz>
>> Unless you change your mind and do a "bzr revert", then they just stay
>> there. (Which isn't terrible, because you might try to merge later, and
>> then you have them).
> 
> But the point is that they then _are_ ancestors of the current revision.
> 

Actually, no, they aren't. If I do a merge, they are ancestors of the
working tree. If I revert the working tree, then they are ancestors of
nothing in the local branch. I think it is fine to leave them there,
because if I tried to merge once, *most* of the time it means I will try
to merge again at some later time.

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/20051116/e5476d75/attachment.pgp