The push|pull vs update distinction

[Andrew Cowie]

On Tue, 2008-01-15 at 01:55 -0500, Aaron Bentley wrote:
> > protocol, pull always updates the working tree and push never does.
> 
> Push does update the working tree if the
> working tree is using the filesystem.

Yeah, that's the discrepancy I was alluding to.

++

I understand why merge doesn't commit (and accept* that one).

++

I'm still hoping that we can change the fact that `bzr push bzr
+ssh://example.com/...` doesn't internally have the remote bzr server
process do `bzr update` on the remote filesystem as `bzr push` locally
does.

If we can deal with the "what happens if there are problems updating
after a local push" case (ie, you cd to the other branch and deal with
it), then surely we can deal with "what happens if there are problems
updating in a remote push" when we clearly have shell** access to the
target (ie, you ssh to the other branch and deal with it).

Yes, the push-and-update plugin is the workaround, but it incurs a
second ssh connection which takes a lot of time, and seems unnecessary
given `bzr serve` is already instantiated and running.

AfC
Sydney


* except for a caveat about dotted revnos and commit messages that I've
been drafting and will send along as soon as I can. Short version: I
think that we could emphasize the original contribution revisions rather
than the merge revisions.

** I do get that there are scenarios where the remote account|shell have
been set to prevent interactive login etc. Perhaps the way to deal with
this is to have push "fail" if the update step fails (would fail?). This
is, after all, the converse of what happens if you try to commit to a
bound branch and the remote branch commit fails... and the fact that the
revisions have meanwhile been shipped to the other side is all good.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080115/a2ccf604/attachment.pgp