rfc: remove "revision specs"

Robert Collins robertc at robertcollins.net
Tue Aug 30 07:08:16 BST 2005


On Tue, 2005-08-30 at 00:48 -0400, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Robert Collins wrote:
> > however, something like './bzr.dev,rev=1040' is std66 conformant for url
> > path element parameterisation. I think that that is not great for
> > command line ui, but it would be nice to retain the unambiguous
> > single-string facility.
> 
> I think you'll hit situations where you want to merge with revisions or
> bases that aren't in the revision history.  Maybe it's better to use
> location/revision ID pairs.

I'm not sure what you mean. A sample pqm bzr merge command might be:
merge http://www.robertcollins.net/foo/bar;rev=45 \
http://bazaar.canonical.com/foo/bar

This says 'merge from http://www.robertcollins.net/foo/bar' up to rev 45
into 'http://bazaar.canonical.com/foo/bar'. 

If you mean 'one might want to specify a revision in
http://www.robertcollins.net/foo/bar that isn't in the
http://www.robertcollins.net/foo/bar revision-history' - then I think
there are two useful approaches for that. One is - 'you can't' - which
is what PQM currently states for baz branches. Another is just to have a
parameter for revid:

merge http://www.robertcollins.net/foo/bar;revid=mbp@sourcefrom.net... \
http://bazaar.canonical.com/foo/bar

Note that we aren't specifying bases here - PQM presumes that you have
merged from the mainline sufficiently closely that there will be no
conflicts.

The reason I dont want to pass in pairs is that makes the common case
api more complex, or makes the grammar ambiguous. It would also start to
push RCS specific parsing logic into PQM. If URL's with parameters are a
supported syntax for describing revisions in bzr branches, PQM can just
pass the entire thing to bzr and have it work correctly.

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: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050830/b9d17f74/attachment.pgp 


More information about the bazaar mailing list