reverse merge....

[Erik Bågfors]

On 9/11/06, John Arbash Meinel <john at arbash-meinel.com> wrote:
> Erik Bågfors wrote:
> > Hi
> >
> > After having some discussions with people that wants to use bzr, it's
> > clear that they want to
> > 1) work in disconnected mode (and not use checkouts and "commit --local")
> > 2) push changes to trunk when they feel like it
> > 3) Not have more than one branch locally
> > 4) Not disrupt history of trunk...
> >
>
> ...
>
> >
> > bzr merge --reverse?
> >
> > /Erik
>
> This was mentioned a while ago, though I can't remember the specifics at
> this point.
>
> My only issue with this specific notation is that it sounds like you are
> reversing the merge (undo the merge) rather than just reversing the parents.
>
> Maybe 'bzr merge --switch-base', or something similar would be better.

That's good..

> Or maybe the command 'bzr merge-into'.

Ehh? Doesn't make sense for me :)

> But I think Aaron has a good point with making '--local' the default,
> and then they can use the regular 'update' to work with the remote branch.

I tend to agree.

> I really do think it is much cleaner to have an upstream checkout, and
> another working directory. It also gets them prepared when they want to
> work on more than one branch at a time.

Me also, my suggestion (which is how I plan on working myself) is to
have one checkout, then branch that checkout into a new branch, hack
in, then merge back to the checkout when I feel ready.

That feels very natural for me, but people do not understand why you
should need multiple branches on local machine.

People coming from cvs/svn doesn't quite think the same way about
branches as I do (ie. branches are good, create many :) )

> But if you are getting a lot of negative feedback about it, I'm sure
> there are other things we can do.

Personally, I really like the "checkout and commit with --local being
default" model.

I'll get back to you later to see what people think...

/Erik

-- 
google talk/jabber. zindar at gmail.com
SIP-phones: sip:erik_bagfors at gizmoproject.com
sip:17476714687 at proxy01.sipphone.com