creating checkouts, bound branches and standalone branches from an existing branch

[Robert Collins]

On Wed, 2006-02-15 at 15:36 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > On Wed, 2006-02-15 at 08:57 -0600, John A Meinel wrote:
> 
> >>I'm not sure if --swap-parents is the best word for it. Maybe
> >>'--reparent'. I understand the idea of "merge me into them on my local
> >>branch". So that when you are done, you are merged, and you see the
> >>remote ancestry.
> >>
> >>I agree we want it, I'm not sure what the option should be named. Or how
> >>to convey the information in a simple way.
> > 
> > 
> > I think 'update' is the logical command to put it in, as thats what
> > people expect to use in a shared branch environment.
> 
> As I've mentioned to you on IRC, I think we should explore doing the
> parent swap at commit time.  It would be a lot simpler to make robust.
> There is a disadvantage in terms of expectations, though.  After a
> normal update, diff shows your local changes.  After a merge, diff shows
> the upstream changes.

I'm happy for us to explore it; I'm just not convinced yet. If we can
get the ui right and have the swap occur at commit, I'm fine - but I
think that diff and status and log and ancestry... need to be fixed to.

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/20060216/d96c78ce/attachment.pgp