How to get the diff between two arbitrary remote revisions?

Aaron Bentley aaron.bentley at utoronto.ca
Wed Nov 16 13:48:43 GMT 2005


-----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.
And there's also the fetch command.

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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDezi70F+nu1YWqI0RAhetAJ4qXmgcOoD3WvmcSxi81KKIz0WEqwCfbbmy
Vi4xLSYV3zQZuN2CC6pzEmE=
=oVcO
-----END PGP SIGNATURE-----




More information about the bazaar mailing list