[merge] robert, aaron, daniel

[Martin Pool]

On 17 Nov 2005, John A Meinel <john at arbash-meinel.com> wrote:
> Aaron Bentley 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.
> > 
> > Aaron
> 
> Well, I would have to setup a second branch. Because I want my
> integration branch to only be things that I feel are finished up, that
> someone would be happy to merge them. (Hence why I didn't merge bound
> branches into my integration branch). I want both Robert and Martin to
> feel that they can merge my integration branch safely.

Yes, I would prefer that there be one branch from each of you which is
uncontroversially mergeable at any point, and everything else goes in
feature branches.

-- 
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/82a1fd9e/attachment.pgp