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

[Robert Collins]

On Wed, 2006-02-15 at 08:57 -0600, John A Meinel wrote:
> Jan Hudec wrote:
> > On Wed, Feb 15, 2006 at 18:08:32 +1100, Robert Collins wrote:
> >> On Tue, 2006-02-14 at 11:55 -0600, John A Meinel wrote:
> 
> ...
> 
> > 
> > I like the 'local/full' approach better. I think it's better to be
> > explicit in this. Besides it might be useful to pretend you are offline
> > when you are not. And waiting for the remote access to time-out may not
> > be pleasant either.
> 
> This can be done today with a regular standalone branch. And using "bzr
> commit" and "bzr push".

Well, no :). bzr push with convergence will make the other branch look
like this one, and if thats shared then you get propogating ripples in
the revision history between the committers. We need some more tool
support to make this nice.
> > 
> > Perhaps there would be a --local (-L) option, that would make the branch
> > behave as unbound for one operation. (All operations that are affected
> > by bound branches should have it. Are there any other than comit?)
> > 
> >> The crucial points both approachs I favour (automatic offline, and local
> >> vs full commits) are that :
> >>  * people dont need to juggle branches around to get the correct 'left
> >> most parent' when committing to the mainline, and when updating along
> >> the shared branch
> > 
> > IMHO there should be a merge --swap-parents to do that. Or maybe update
> > on unbound branch would do that (it's a straigthforward generalization
> > of what it does on a bound one, after all). Because often you want to do
> > that even with an unbound branch.
> 
> 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.

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/626c7806/attachment.pgp