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...@google.com> on 2006/08/30 08:55:02 UTC
svnmerge.py not using standard revision syntax
kfogel@tigris.org writes:
> Log:
> Merged revisions 21307-21314 via svnmerge from
> http://svn.collab.net/repos/svn/trunk to the incomplete-directories branch.
I sure wish that said "Merged r21307-r21314 via svnmerge..." instead.
It's not a completely trivial change, because there are many other
similar constructed messages that would have to be changed as well,
and I have no intention of writing the patch right now. But just out
of curiosity: do y'all agree that it would be a good thing?
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnmerge.py not using standard revision syntax
Posted by Karl Fogel <kf...@google.com>.
Blair Zajac <bl...@orcaware.com> writes:
>> I sure wish that said "Merged r21307-r21314 via svnmerge..." instead.
>>
>> It's not a completely trivial change, because there are many other
>> similar constructed messages that would have to be changed as well,
>> and I have no intention of writing the patch right now. But just out
>> of curiosity: do y'all agree that it would be a good thing?
>
> <aside>
> Not directly related to your point, but I really don't like the r in
> front of the revision number. I do a lot of copy and pasting revision
> numbers between windows and having to select the revision number
> without the r instead of just double-clicking on it is a pain. Say
> you run a svn log and want the revision number for a merge or
> checkout, you just can't double click the rev number and paste it
> elsewhere.
> </aside>
I agree that it can be a drawback in that situation, but it can also
be very valuable to have an easy regexp for detecting Subversion
revision numbers; I tend to think the latter outweighs the former (see
below for a technique to alleviate the cut-and-paste thing, too).
> Maybe we change svnmerge.py to display the r's and also handle r's in
> revision numbers handed to svn? It would look ugly:
>
> svn merge -r r123:r456 http://....
>
> but it would make life easier.
IMHO we should have made that change years ago, yes :-), no argument
here!
Note that you can sometimes just type the dash and then paste exactly
what's in your clipboard, e.g.,:
$ svn log -[then paste "r1234" from clipboard, resulting in...]
==> $ svn log -r1234
I do this all the time. Still, if -r and -c handled extra "r"s, that
would be even better. I'd like to finish my current work on
incomplete directories before making other tweaks, so feel free to
beat me to this one...
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnmerge.py not using standard revision syntax
Posted by Kamesh Jayachandran <ka...@collab.net>.
Karl Fogel wrote:
> Kamesh Jayachandran <ka...@collab.net> writes:
>
>>> svn merge -r r123:r456 http://....
>>>
>> May be just
>> -r 123:456 http://....
>>
>> So that it can be pasted to 'svn
>> diff|merge|whichever_sub_command_which_can_understand_rev_range'
>>
>
> I think you may have misunderstood the suggestion...
>
> The idea is that svn itself should handle revision numbers both with
> and without the "r", so that when you cut-and-paste from a source that
> has the "r", things still work. Your command line above would still
> work, but with the proposed change, all of these would work:
>
> -r 123:456
> -r r123:r456
> -r r123:456
> -r 123:r456
>
> (and of course the space would still be optional).
>
> Best,
> -Karl
>
>
Thanks for the explanation Karl.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnmerge.py not using standard revision syntax
Posted by Karl Fogel <kf...@google.com>.
Kamesh Jayachandran <ka...@collab.net> writes:
>> svn merge -r r123:r456 http://....
> May be just
> -r 123:456 http://....
>
> So that it can be pasted to 'svn
> diff|merge|whichever_sub_command_which_can_understand_rev_range'
I think you may have misunderstood the suggestion...
The idea is that svn itself should handle revision numbers both with
and without the "r", so that when you cut-and-paste from a source that
has the "r", things still work. Your command line above would still
work, but with the proposed change, all of these would work:
-r 123:456
-r r123:r456
-r r123:456
-r 123:r456
(and of course the space would still be optional).
Best,
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnmerge.py not using standard revision syntax
Posted by Kamesh Jayachandran <ka...@collab.net>.
Blair Zajac wrote:
> Karl Fogel wrote:
>> kfogel@tigris.org writes:
>>> Log:
>>> Merged revisions 21307-21314 via svnmerge from
>>> http://svn.collab.net/repos/svn/trunk to the incomplete-directories
>>> branch.
>>
>> I sure wish that said "Merged r21307-r21314 via svnmerge..." instead.
>>
>> It's not a completely trivial change, because there are many other
>> similar constructed messages that would have to be changed as well,
>> and I have no intention of writing the patch right now. But just out
>> of curiosity: do y'all agree that it would be a good thing?
>
> <aside>
> Not directly related to your point, but I really don't like the r in
> front of the revision number. I do a lot of copy and pasting revision
> numbers between windows and having to select the revision number
> without the r instead of just double-clicking on it is a pain. Say
> you run a svn log and want the revision number for a merge or
> checkout, you just can't double click the rev number and paste it
> elsewhere.
> </aside>
>
> Maybe we change svnmerge.py to display the r's and also handle r's in
> revision numbers handed to svn? It would look ugly:
>
> svn merge -r r123:r456 http://....
May be just
-r 123:456 http://....
So that it can be pasted to 'svn
diff|merge|whichever_sub_command_which_can_understand_rev_range'
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svnmerge.py not using standard revision syntax
Posted by Blair Zajac <bl...@orcaware.com>.
Karl Fogel wrote:
> kfogel@tigris.org writes:
>> Log:
>> Merged revisions 21307-21314 via svnmerge from
>> http://svn.collab.net/repos/svn/trunk to the incomplete-directories branch.
>
> I sure wish that said "Merged r21307-r21314 via svnmerge..." instead.
>
> It's not a completely trivial change, because there are many other
> similar constructed messages that would have to be changed as well,
> and I have no intention of writing the patch right now. But just out
> of curiosity: do y'all agree that it would be a good thing?
<aside>
Not directly related to your point, but I really don't like the r in front of
the revision number. I do a lot of copy and pasting revision numbers between
windows and having to select the revision number without the r instead of just
double-clicking on it is a pain. Say you run a svn log and want the revision
number for a merge or checkout, you just can't double click the rev number and
paste it elsewhere.
</aside>
Maybe we change svnmerge.py to display the r's and also handle r's in revision
numbers handed to svn? It would look ugly:
svn merge -r r123:r456 http://....
but it would make life easier.
Regards,
Blair
--
Blair Zajac, Ph.D.
<bl...@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org