[MERGE] When adding rich root data follow the standard revision graph rules, so it does not create 'inconstent parents'.
robert.collins at canonical.com
Tue May 5 04:53:42 BST 2009
On Mon, 2009-05-04 at 22:46 -0500, John Arbash Meinel wrote:
> -----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
> If the core of this is needing to have a Graph.heads() call on the
> rich-root items, you'll find that Inter1And2Helper needs the same fix. I
> basically copy & pasted (and then massaged the code to fit) the code
> into InterDifferingSerializer, because I wanted to remove the extra pass
> over inventories that Inter1and2Helper imposed.
Graph.heads() + lookup for moved items.
> I also just did a quick grep, and I don't see any heads() calls in all
> of fetch.py
> Which I *think* means that you aren't fully testing the inter-format
> fetching across the smart server, since you said in the past that it
> would use the streaming code path for that....
We aren't, because IDS matches always; however as no client will /use/
the streaming conversion code its ok to leave it unfixed for now - as
any fix would be untested and basically untestable.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090505/b2d0e77a/attachment-0001.pgp
More information about the bazaar