[MERGE] checkout

[Robert Collins]

On Mon, 2006-02-13 at 16:50 -0600, John A Meinel wrote:
> Robert Collins wrote:
> > On Tue, 2006-02-14 at 09:17 +1100, Robert Collins wrote:
> > ..
> >>> Otherwise you have satisfactorily addressed all of my comments. I would
> >>> again request that we merge BzrDir into bzr, and then merge checkouts
> >>> after that, just so we have a few less lines to review to get BzrDir merged.
> >>>
> >>> But I'm +1 for checkouts.
> >> Thanks. For BzrDir phase 2 I'm waiting 'a few days' for -1's as you
> >> requested in your +1...  then I'll merge it to integration. Unless Aaron
> >> and Martin wants to say that hes not going to -1 it, in which case I'll
> >> merge it asap. Martins moving at the moment, but I'll ring him and see
> >> what his thoughts are.
> > 
> > Hes sure there are probably some rough bits, but hes happy for them to
> > be found and fixed post hoc in this case.
> > 
> > Rob
> > 
> 
> I have a few bugfixes in jam-integration. Can you make sure any
> conflicts are resolved before you merge BzrDir? I can myself resolve
> them if I have to, but it would be nice if I didn't have to.

I'll merge jam-integration to integration first. (I've already pulled a
copy to do this)

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: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060214/4ddb8008/attachment.pgp