Bound branch implementation

Erik Bågfors zindar at gmail.com
Tue Nov 15 09:57:37 GMT 2005


2005/11/14, John A Meinel <john at arbash-meinel.com>:
> Erik Bågfors wrote:
> >> I thought that bind might already be doing that last push. I know if you
> >> have regular commits, and there are no remote changes, then the bind
> >> will push them. But it may not be smart enough to handle a merged change
> >> yet.
> >>
> >> That would make it:
> >> $ bzr bind
> >> Cannot bind, you must merge first
> >> $ bzr merge
> >> $ bzr commit -m "merge"
> >> $ bzr bind
> >
> > This was exactly what I wrote and proposed :)
> >
> > And THIS time when I try it, it works.  Maybe it worked all along, I
> > just assumed the message
> > bzr: ERROR: These branches have diverged. Try merging, and then push
> > the change to the remote branch.
> >
> > Meant I needed to push before bind.
>
> Well, when I wrote that error message, I hadn't decided if "bzr bind"
> would do a push. But I figured that was acceptable behavior, so I just
> need to go back and fix the message.


Great!

>
> Are you using this bound to a remote branch (over sftp), or is it a
> local one? I'm just curious if I made remote access work (by handling
> the NoWorkingTree exception). I thought there was more that I needed to
> do, but so far it seems to be working. (Other than the fact that the
> remote working tree doesn't get updated).

I hadn't tried using a remote branch over sftp with this until now.
I'm happy to say that it works great! :)

/Erik




More information about the bazaar mailing list