[merge] robert, aaron, daniel

[Martin Pool]

On 17 Nov 2005, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> John A Meinel wrote:
> > I don't really like using features until they are in 'bzr.dev' unless I
> > have to. And it would be really nice to be able to bind my branches to
> > my published location.
> 
> I guess we're different on that point.  I'm *still* using my integration
> branch of tla at work (because Fai doesn't support baz).
> 
> Now that I'm making bzr.ab my "mergeable stuff" branch, I'm very tempted
> to set up an integration branch so I could actually use the things I'm
> writing.

Well, even with nice merge tools divergence between trees still has a
cost - Jelmer's branch ABC refactoring overlapped with Robert's working
tree changes and needed some manual untangling.  I'd like to have us all
stay close to my tree for day to day use; if there's something you need
that's not in there yet then hassle me to put it in.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051118/4f5ccca0/attachment.pgp