[merge] update --revision

Robert Collins robertc at robertcollins.net
Fri Sep 15 23:20:56 BST 2006


On Thu, 2006-09-14 at 16:09 -0500, John Arbash Meinel wrote:
> This is Mattheiu Moy's patch to add the '--revision' argument to update.
> 
> The only changes are some line-breaking (to keep it under 80
> characters), and I added a NEWS entry.
> 
> I'm +1 on the change, and would like to see it merged for bzr-0.11.
> 
> You can get the branch from here:
> http://bzr.arbash-meinel.com/branches/bzr/0.11-working/update-r
> 
> I also associated the branch with the bug here:
> https://launchpad.net/products/bzr/+bug/45719
> 
> So you can get the branch out of that as well. (At least once Launchpad
> mirrors my branch).

I think this code is more complex than needed. Why not just resolve the
revision that is desired from the master branch if there is one or the
local otherwise rather than trying for it locally then remotely. This
will be more understandable too, because the master should be
authoritative for this.

I dont like the abstraction break of calling branch.update outside
tree.update : the command should be nothing more than:

- establish the requested revision id from the authoritative branch
(master if its bound, local if not)
- call tree.update(revision_id=revision_id)
- examine the return code of update to determine if more user output is
needed.

Unfortunately the current update seems to have diverged slightly from
that, leading to a slipperly slope it seems.

-0 from me. That is if you really think its right as is and someone else
+1's it, go ahead.

-Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060916/26810672/attachment.pgp 


More information about the bazaar mailing list