You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@red-bean.com> on 2007/06/05 01:06:35 UTC
Revision number syntax in merge notifications.
In notifications like this:
--- Merging revisions 5-16:
D products/little.html
D products/big.html
A products/medium
A products/medium/roadmap.html
...maybe we should use the rN syntax:
--- Merging r5-r16:
D products/little.html
D products/big.html
A products/medium
A products/medium/roadmap.html
See also http://subversion.tigris.org/issues/show_bug.cgi?id=2366.
Thoughts?
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Erik Huelsmann <eh...@gmail.com>.
On 6/5/07, Karl Fogel <kf...@red-bean.com> wrote:
> In notifications like this:
>
> --- Merging revisions 5-16:
> D products/little.html
> D products/big.html
> A products/medium
> A products/medium/roadmap.html
>
> ...maybe we should use the rN syntax:
>
> --- Merging r5-r16:
> D products/little.html
> D products/big.html
> A products/medium
> A products/medium/roadmap.html
>
> See also http://subversion.tigris.org/issues/show_bug.cgi?id=2366.
>
> Thoughts?
+1. I think that we should release new code as close to conventions we
think we'll be using in 2.0. (Since new code doesn't have compat
problems, we still can choose now.)
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Ben Collins-Sussman <su...@red-bean.com>.
Fair enough, changed in r25295.
On 6/5/07, C. Michael Pilato <cm...@collab.net> wrote:
> Karl Fogel wrote:
> > In notifications like this:
> >
> > --- Merging revisions 5-16:
> > D products/little.html
> > D products/big.html
> > A products/medium
> > A products/medium/roadmap.html
> >
> > ...maybe we should use the rN syntax:
> >
> > --- Merging r5-r16:
> > D products/little.html
> > D products/big.html
> > A products/medium
> > A products/medium/roadmap.html
> >
> > See also http://subversion.tigris.org/issues/show_bug.cgi?id=2366.
> >
> > Thoughts?
>
> I thought one of the proposed benefits of the rN syntax was that it was easy
> to drop those things into a command line. That is, when you see "r56" you
> can easily plop that into 'svn cat -<HERE>' or 'svn log -<HERE>' ...
>
> With that in mind, +1 on using the rN syntax, but that means doing:
>
> Merging r3
> Merging r5:16
>
> instead of:
>
> Merging r3
> Merging r5-r16
>
> --
> C. Michael Pilato <cm...@collab.net>
> CollabNet <> www.collab.net <> Distributed Development On Demand
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Mattias Engdegård <ma...@virtutech.se>.
"C. Michael Pilato" <cm...@collab.net> writes:
>But -c5-16 means nothing, and I'd rather read "revisions 5-16" (which has no
>command-line-option utility, but has a crystal-clear meaning) than something
>which looks like a command-line option but ain't.
My suggestion was actually for svnmerge.py, but I don't think -cN-M
would be a bad synonym for -r(N-1):M in ordinary svn subcommands.
Anyway, I think this has been discussed here before.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by "C. Michael Pilato" <cm...@collab.net>.
Ben Collins-Sussman wrote:
> After some more bikeshed discussion in IRC, most of us seem
> comfortable with this syntax:
>
> Merging rX through rY:
>
> It keeps the 'rX' party line, but also prevents confusion with
> commandline range arguments.
>
> Any objections?
Doesn't match my wallpaper. Can you add a tinge of magenta?
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Revision number syntax in merge notifications.
Posted by Ben Collins-Sussman <su...@red-bean.com>.
Committed in revision 25302. Er, I mean, r25302.
On 6/5/07, Karl Fogel <kf...@red-bean.com> wrote:
> "Ben Collins-Sussman" <su...@red-bean.com> writes:
> > After some more bikeshed discussion in IRC, most of us seem
> > comfortable with this syntax:
> >
> > Merging rX through rY:
> >
> > It keeps the 'rX' party line, but also prevents confusion with
> > commandline range arguments.
>
> +1
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Karl Fogel <kf...@red-bean.com>.
"Ben Collins-Sussman" <su...@red-bean.com> writes:
> After some more bikeshed discussion in IRC, most of us seem
> comfortable with this syntax:
>
> Merging rX through rY:
>
> It keeps the 'rX' party line, but also prevents confusion with
> commandline range arguments.
+1
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Ben Collins-Sussman <su...@red-bean.com>.
On 6/5/07, Karl Fogel <kf...@red-bean.com> wrote:
> But "revisions X-Y" should be trivially translatable to "rX-rY", just
> as "revision X" is trivially translatable to "rX".
>
> So why not use the hyphen syntax as above, as I originally suggested,
> instead of the colon syntax that would misleadingly imply the
> diff-range style?
I see the tension here.
On the one hand, we want commandline output to start using 'rX' syntax
instead of 'revision X'. Currently commands like 'svn update' end
with phrases like "Updated to revision 9", and we want to change them
to say "Updated to r9". The rX syntax is a uniform syntax we'd like
to see used everywhere.
On the other hand, we need to be extremely careful when saying
"Merging rX-rY", because it looks really similar to "rX:rY", which
means one thing on the commandline and something different during a
merge.
After some more bikeshed discussion in IRC, most of us seem
comfortable with this syntax:
Merging rX through rY:
It keeps the 'rX' party line, but also prevents confusion with
commandline range arguments.
Any objections?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Karl Fogel <kf...@red-bean.com>.
"Ben Collins-Sussman" <su...@red-bean.com> writes:
> Whoops, I'm going to revert my change.
>
> I now remember why I very specifically did *not* go with the "rX:Y"
> syntax originally. It's because I did *not* want users to think it
> was the same as running -rX:Y on the commandline. As cmpilato pointed
> out, -rX:Y means that X is a comparison endpoint, but isn't itself
> being merged. But in the case of "revision ranges" during a merge, a
> merge-range with values (5, 16) means that r5 is being merged. That's
> why I originally wrote "revisions 5-16", which is layspeak for
> "changesets 5 through 16 inclusive".
>
> Thanks for reminding me, Karl and Mike. :-)
But "revisions X-Y" should be trivially translatable to "rX-rY", just
as "revision X" is trivially translatable to "rX".
So why not use the hyphen syntax as above, as I originally suggested,
instead of the colon syntax that would misleadingly imply the
diff-range style?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by Ben Collins-Sussman <su...@red-bean.com>.
Whoops, I'm going to revert my change.
I now remember why I very specifically did *not* go with the "rX:Y"
syntax originally. It's because I did *not* want users to think it
was the same as running -rX:Y on the commandline. As cmpilato pointed
out, -rX:Y means that X is a comparison endpoint, but isn't itself
being merged. But in the case of "revision ranges" during a merge, a
merge-range with values (5, 16) means that r5 is being merged. That's
why I originally wrote "revisions 5-16", which is layspeak for
"changesets 5 through 16 inclusive".
Thanks for reminding me, Karl and Mike. :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by "C. Michael Pilato" <cm...@collab.net>.
Mattias Engdegård wrote:
> "C. Michael Pilato" <cm...@collab.net> writes:
>
>> Merging r3
>> Merging r5:16
>
>> instead of:
>
>> Merging r3
>> Merging r5-r16
>
> Is c5 (r4:5) included in the merge? If so, r5:16 is incorrect or at least
> inconsistent.
> svnmerge.py includes the lower bound in its -r5-16 notation; perhaps it should
> use -c5-16 instead.
You have a good point there, followed up by a bad suggestion. :-)
-r5:16 does *not* include revision 5. I don't know if that is consistent
with Ben's reportion intentions or not. Ben?
But -c5-16 means nothing, and I'd rather read "revisions 5-16" (which has no
command-line-option utility, but has a crystal-clear meaning) than something
which looks like a command-line option but ain't.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Revision number syntax in merge notifications.
Posted by Mattias Engdegård <ma...@virtutech.se>.
"C. Michael Pilato" <cm...@collab.net> writes:
> Merging r3
> Merging r5:16
>instead of:
> Merging r3
> Merging r5-r16
Is c5 (r4:5) included in the merge? If so, r5:16 is incorrect or at least
inconsistent.
svnmerge.py includes the lower bound in its -r5-16 notation; perhaps it should
use -c5-16 instead.
Colloquially everyone seem to use rN both for revision N and change N-1:N.
The phrase "please have a look at r4711" must be interpreted in context
to understand what is meant, so consistenly using cN might be an improvement.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Revision number syntax in merge notifications.
Posted by "C. Michael Pilato" <cm...@collab.net>.
Karl Fogel wrote:
> In notifications like this:
>
> --- Merging revisions 5-16:
> D products/little.html
> D products/big.html
> A products/medium
> A products/medium/roadmap.html
>
> ...maybe we should use the rN syntax:
>
> --- Merging r5-r16:
> D products/little.html
> D products/big.html
> A products/medium
> A products/medium/roadmap.html
>
> See also http://subversion.tigris.org/issues/show_bug.cgi?id=2366.
>
> Thoughts?
I thought one of the proposed benefits of the rN syntax was that it was easy
to drop those things into a command line. That is, when you see "r56" you
can easily plop that into 'svn cat -<HERE>' or 'svn log -<HERE>' ...
With that in mind, +1 on using the rN syntax, but that means doing:
Merging r3
Merging r5:16
instead of:
Merging r3
Merging r5-r16
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Revision number syntax in merge notifications.
Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Mon, Jun 04, 2007 at 06:06:35PM -0700, Karl Fogel wrote:
> In notifications like this:
>
> --- Merging revisions 5-16:
>
> ...maybe we should use the rN syntax:
>
> --- Merging r5-r16:
>
> Thoughts?
>
This is probably a bikeshed, but: a while back, we'd sorta settled on
the idea that we should use "rN" to represent a tree-at-point-in-time,
and "cN" to represent a delta-between-two-trees (Julian, IIRC, posted a
good summary). I don't know if that is worth considering in this case;
I mention it only for completeness.
Regards,
Malcolm