[MERGE/RFC] Add dotted-decimal revision numbers to merge_sorted output

Aaron Bentley aaron.bentley at utoronto.ca
Thu Sep 7 14:12:21 BST 2006


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

Robert Collins wrote:
> When you merge Z, until you commit, there are no revnos for the
> ancestors it brings in. 
> 
> When you do the commit, (or if we synthesise a graph entry that looks
> like the commit would), you get a graph that looks like:
> 
> {K: ['J', 'Z'],
>  EXISTING_GRAPH_OF_J,
>  EXISTING_GRAPH_OF_Z
> }
> 
> Now, because we assign sequences during the pre-order portion of the
> traversal, ALL the nodes that existin in the portion reachable by J are
> assigned first - as they would be when K did not exist. So they are
> stable.
> 
> The nodes for the Z subgraph - which may indeed join with the J subgraph
> - are visited later, and thus cannot affect the numbers assigned to the
> components of J.

So, if I understand correctly, the nodes appear in the order that they
were merged into the target revision, which makes them stable.  But
nodes which have not are not ancestors of a given revision have no revno
with respect to that revision, because they were not merged by it.

Is that right?

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

iD8DBQFFABq10F+nu1YWqI0RArs9AJ0ZuitxrOOgTJUlVS3RllfXMbuDUACfX6w4
AiGpiPq9eUHjZQFMZofZXuw=
=QNhu
-----END PGP SIGNATURE-----




More information about the bazaar mailing list