[MERGE] When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.

Tue May 5 21:58:15 BST 2009

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

Robert Collins wrote:
> This fixes the bug Aaron found vis-a-vis upgrading to rich roots - that
> you got inconsistent parents and had to immediately reconcile to fix
> that.
> 
> -Rob
> 

BB:approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoAqGcACgkQJdeBCYSNAAOy4wCffeYz1a4DrzVc2mw4KKhfSY5/
sdcAn2hbhyKqD2c68uywQdPEZy58vmtU
=REO3
-----END PGP SIGNATURE-----