How to get the diff between two arbitrary remote revisions?

[Jan Hudec]

On Wed, Nov 16, 2005 at 08:48:43 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Jan Hudec wrote:
> > On Tue, Nov 15, 2005 at 23:02:48 -0500, Aaron Bentley wrote:
> 
> >>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.
> 
> No, it also happens when you try to pull and have divergent branches.

I had the impression, that pull will refuse to do that.

> And there's also the fetch command.

Ok, than it's possible and my impression was wrong.

> Anyhow, having a pending merge is a common state.
> 
> > Becase once you commit, they become ancestors of the current revision.
> 
> If you commit.  I often do test merges into into Robert's or Martin's
> branches, and then pull them out without committing.  And of course,
> repository-based branches will have access to many unrelated branches.

And the revisions remain there? Ok, than my impression was wrong.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051116/d7401bcc/attachment.pgp