[MERGE] pull converges

[Robert Collins]

On Tue, 2006-04-11 at 17:42 +1000, Martin Pool wrote:
> On 11/04/2006, at 12:05 PM, Robert Collins wrote:
> 
> > This patch alters pull to converge when possible.
> >
> > Specifically it:
> >  * deprecates branch.pullable_revisions[obsolete]
> >  * changes update_revisions to use the left-most available parents
> >    when applying perfect fit revisions
> >
> > This will preserve the revision history during --overwrite - so we get
> > an identical branch - but will not do so when applying perfect fit
> > revisions. In that case the revision history is regenerated from the
> > repository using the left most parent.
> >
> > Its not an option to pull because I think we either want this, or we
> > dont. If we do - the way to get experience with it is to just use it.
> 
> Yes, I agree, and +1 to put it in, except that it needs documentation  
> updates in NEWS, tutorial.txt and the help for pull.
> 
> I guess push should change to work the same way - perhaps that can  
> wait until we see if we like it for pull.

This is an updated patch, it adds the requested doco - does that look
ok ? and also adds a test for pulling when a merge was indirectly done
to the parent.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pull-converges.patch
Type: text/x-patch
Size: 15942 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060412/56735d46/attachment.bin 
-------------- 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/20060412/56735d46/attachment.pgp