[MERGE] reconcile patch to correct the ancestry graph.

[Robert Collins]

On Wed, 2006-05-03 at 13:27 +1000, Martin Pool wrote:
> On  3 May 2006, Robert Collins <robertc at robertcollins.net> wrote:
> > > There's a new assumption here which is probably reasonable but might not
> > > be expected: after reconciliation, the primary parent is guaranteed to
> > > be correct but the others may be out of order.  (Or is there a stronger
> > > guarantee?)  I think that should be written down somewhere - a docstring
> > > on the reconcile function or class would do.
> > 
> > Its currently written down in the tests for this patch. I think the
> > right place to write this down is Repository.get_graph and
> > get_graph_with_ghosts.
> 
> Yes, or in the documentation for Knit.

Its an attribute of the Repository contract, not the knit versioned
file, so Repository is the right place.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060503/ba8c477d/attachment.pgp