Bound branch implementation

[John A Meinel]

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.

> 
>> Yes, we could have bind run merge if it fails, but I don't prefer having
>> bind modify my working tree. That is why we have merge. And certainly I
>> don't want it to commit the merge until I've looked over it.
> 
> Agreed
> 
> This is just SO excellent.

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).

John
=:->

> 
> /Erik
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051114/d8d9d6b6/attachment.pgp