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

[John Arbash Meinel]

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


...

> The scheme we discussed on IRC is problematic because its not easy to
> understand:
> There are two basic options with the approach we were considering - one
> is that the merges *into* revision 3 get prefixed with 3., and the other
> is that merges into revision *4* get prefixed with 3. - so that anything
> between 3 and 4 is 'content merged in in 4'. Neither is very
> satisfactory, so I just bit the bullet and assigned them according to
> their ancestors, not the merge point. It should be equivalent in
> performance though.
> 
> -Rob

Actually, I always thought they were based on the source. And I thought
that is what I just outlined.

I think numbering off of the ancestor works just fine, and gives very
reasonable numbers.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFE/5VrJdeBCYSNAAMRAvnrAKCox3dPSHVEtOBE6m00Dd586uSdHgCgjfQg
NbC0BTpvnn1EB9dkab9ycP0=
=5cfy
-----END PGP SIGNATURE-----