reverse merge....

[Erik Bågfors]

Answering to both of you in this mail.....

On 9/11/06, Matthieu Moy <Matthieu.Moy at imag.fr> wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
>
> > Erik Bågfors wrote:
> >> 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...
> >
> > This sounds more like they do want to use checkouts, but don't like the
> > default of non-local commits.  If they alias commit to "commit --local",
> > then this works:
> >
> > bzr branch sftp://...../trunk

I assume this should be checkout? not branch?

> > cd trunk
> > hack hack; commit; commit
> > bzr update
> > bzr commit --no-local

This should work.... very close to the right thing.  Didn't remember
we now have "--no-" for everything, very nice.

> Indeed, I wonder if it would be worth having a "bzr connect"/"bzr
> disconnect" (most likely as a plugin) to say wether commit should be
> local or not. I think I would be using it.

bzr bind, bzr unbind, what more do you want?

I agree the connect and disconnect are better words, since we are not
really talking about bound branches anymore.

> > Certainly possible.  I wonder whether bzr merge; bzr pull --overwrite
> > could/should achieve this?
>
> I'd say no, since after "bzr merge", you have the remote changes
> as pending merges in your tree, not the local ones. But I may have
> missed something.

I have to agree that it would be really nice if it put all the
revisions it removes in merge mode.  Right now, what happens is

: [bagfors at zyrgelkwyt]$ ; bzr pull --overwrite
Using saved location: /home/bagfors/t/
All changes applied successfully.
-1 revision(s) pulled.

: [bagfors at zyrgelkwyt]$ ; bzr st

[NOTHING RETURNED]


> Indeed, a swiss-army-knife would be
> "bzr convert-commits-to-pending-merge -r ...". It could be funny to
> have it also (but certainly not in the core, no need to bother the
> normal user with one more command).

Sounds like a perfect plugin to build...

> Then, "merge --reverse" could be built like this:
>
> $ bzr convert-commits-to-pending-merge -r ancestor:remote-branch
> $ bzr pull

For this as well...

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