[MERGE] pull converges

[Robert Collins]

On Wed, 2006-04-12 at 14:58 +1000, Martin Pool wrote:
> On 12/04/2006, at 2:13 PM, Robert Collins wrote:
> 
> > 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.
> 
> > === modified file 'a/NEWS'
> > --- a/NEWS	
> > +++ b/NEWS	
> > @@ -66,6 +66,10 @@
> >      * New 'init-repository' command, plus support for repositories  
> > in 'init'
> >        and 'branch' (Aaron Bentley, Erik Bågfors)
> > +
> > +    * 'pull' and 'push' now normalise the revision history, so  
> > that any two
> > +      branches with the same tip revision will have the same  
> > output from 'log'.
> > +      (Robert Collins)
> >    CHANGES:

> This is not quite precisely what the patch does -- after pulling in  
> one direction the two branches are not guaranteed to be the same if  
> the source was not canonical.  Perhaps this is too subtle to explain  
> in the news file.

Definately too subtle.

...
> it would be nice if this method was smaller.
> 
> +1

Yah, as I said to aaron though, I'm not sure which way to slice it just
yet.

Thanks 
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/20060412/4f047ec5/attachment.pgp