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

[Aaron Bentley]

-----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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD85DO0F+nu1YWqI0RAn2JAJ9oUZL6HnopfBVbg0UW/rald3E+zQCfT0l6
eFYG0VatAc7MAmLCZr9SKfI=
=Z0vA
-----END PGP SIGNATURE-----