[PLUGIN] bzr missing

Aaron Bentley aaron.bentley at utoronto.ca
Mon Jun 27 01:58:00 BST 2005


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John A Meinel wrote:
> It also doesn't handle the case that the histories are different, and
> just happen to be the same for one revision. Though I don't know that it
> is possible, since each revision id is actually unique with a completely
> unique history (at this point). Is there plans to change it such that a
> given revision id has a variable parent. Because as long as all revision
> ids have a unique (set of) parent(s), then a revid actually uniquely
> defines the history as well. (X always points to Y always points to Z ...)

Revisions may now have multiple parents, so I was wrong when I said that
all you needed was the revision ID.  Formerly, the revision ID implied
the revno, but that is no longer true.

A quick example:

Branch 1
A -> B -> C -> D

Branch 2
A -> E -> F -> G -> D

In branch 1, the revno is 4, in branch 2 it's 5.  D is either a merge
from G into branch 1 or a merge from C into branch 2, and it doesn't
matter which one it is.

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

iD8DBQFCv08X0F+nu1YWqI0RAs85AJ94dkhprlyyYCA0d13G90LmPGtoqwCfRdsC
sp8CBn5q38r7xGFzxRgUkZc=
=4f2D
-----END PGP SIGNATURE-----




More information about the bazaar mailing list