creating checkouts, bound branches and standalone branches from an existing branch
Jan Hudec
bulb at ucw.cz
Thu Feb 16 06:15:06 GMT 2006
On Thu, Feb 16, 2006 at 07:13:18 +1100, Robert Collins wrote:
> > >> 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.
Actually I think it should be available through both. At least it has to
be immediately obvious when one does bzr merge --help, because that's
where many users are going to look for it (after all it is a merge they
want to do).
--
Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- 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/20060216/d088df35/attachment.pgp
More information about the bazaar
mailing list