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

[Robert Collins]

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-368921-4325.patch
Type: text/x-patch
Size: 20160 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090505/fec65238/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090505/fec65238/attachment-0001.pgp