You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by do...@apache.org on 2011/12/22 06:17:06 UTC
svn commit: r1222040 - /subversion/trunk/subversion/libsvn_client/diff.c
Author: dongsheng
Date: Thu Dec 22 05:17:05 2011
New Revision: 1222040
URL: http://svn.apache.org/viewvc?rev=1222040&view=rev
Log:
Making up for the missing single quotation mark.
Obvious fix.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1222040&r1=1222039&r2=1222040&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 22 05:17:05 2011
@@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
*url1, *rev1, *rev2);
else
return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
- _("Diff targets '%s and '%s' were not found "
+ _("Diff targets '%s' and '%s' were not found "
"in the repository at revisions '%ld' and "
"'%ld'"),
*url1, *url2, *rev1, *rev2);
Re: svn commit: r1222040 - /subversion/trunk/subversion/libsvn_client/diff.c
Posted by Dongsheng Song <do...@apache.org>.
1.7.x has the same issue, I don't know if it needs to be modified too.
On Thu, Dec 22, 2011 at 13:17, <do...@apache.org> wrote:
>
> Author: dongsheng
> Date: Thu Dec 22 05:17:05 2011
> New Revision: 1222040
>
> URL: http://svn.apache.org/viewvc?rev=1222040&view=rev
> Log:
> Making up for the missing single quotation mark.
>
> Obvious fix.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/diff.c
>
> Modified: subversion/trunk/subversion/libsvn_client/diff.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1222040&r1=1222039&r2=1222040&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/diff.c (original)
> +++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 22 05:17:05 2011
> @@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
> *url1, *rev1, *rev2);
> else
> return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
> - _("Diff targets '%s and '%s' were not found "
> + _("Diff targets '%s' and '%s' were not found "
> "in the repository at revisions '%ld' and "
> "'%ld'"),
> *url1, *url2, *rev1, *rev2);
>
>
Re: svn commit: r1222040 -
/subversion/trunk/subversion/libsvn_client/diff.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
On Thu, Dec 22, 2011, at 17:37, Stefan Sperling wrote:
> On Thu, Dec 22, 2011 at 06:32:54PM +0200, Daniel Shahaf wrote:
> > So, are you going to merge it or nominate it in STATUS? You haven't done either.
>
> It has been applied to 1.7.x in r1222113.
The fix is not present in HEAD of 1.7.x.
Re: svn commit: r1222040 -
/subversion/trunk/subversion/libsvn_client/diff.c
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Dec 22, 2011 at 06:32:54PM +0200, Daniel Shahaf wrote:
> So, are you going to merge it or nominate it in STATUS? You haven't done either.
It has been applied to 1.7.x in r1222113.
Re: svn commit: r1222040 -
/subversion/trunk/subversion/libsvn_client/diff.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
So, are you going to merge it or nominate it in STATUS? You haven't done either.
On Thu, Dec 22, 2011, at 20:36, Dongsheng Song wrote:
> Yes, I mean merge to 1.7.x.
>
> On Thu, Dec 22, 2011 at 17:51, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> > Merge to 1.7.x?
> >
> > On Thu, Dec 22, 2011, at 05:17, dongsheng@apache.org wrote:
> >> Author: dongsheng
> >> Date: Thu Dec 22 05:17:05 2011
> >> New Revision: 1222040
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1222040&view=rev
> >> Log:
> >> Making up for the missing single quotation mark.
> >>
> >> Obvious fix.
> >>
> >> Modified:
> >> subversion/trunk/subversion/libsvn_client/diff.c
> >>
> >> Modified: subversion/trunk/subversion/libsvn_client/diff.c
> >> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1222040&r1=1222039&r2=1222040&view=diff
> >> ==============================================================================
> >> --- subversion/trunk/subversion/libsvn_client/diff.c (original)
> >> +++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 22 05:17:05 2011
> >> @@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
> >> *url1, *rev1, *rev2);
> >> else
> >> return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
> >> - _("Diff targets '%s and '%s' were not found "
> >> + _("Diff targets '%s' and '%s' were not found "
> >> "in the repository at revisions '%ld' and "
> >> "'%ld'"),
> >> *url1, *url2, *rev1, *rev2);
> >>
> >>
> >>
>
Re: svn commit: r1222040 - /subversion/trunk/subversion/libsvn_client/diff.c
Posted by Dongsheng Song <do...@apache.org>.
Yes, I mean merge to 1.7.x.
On Thu, Dec 22, 2011 at 17:51, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> Merge to 1.7.x?
>
> On Thu, Dec 22, 2011, at 05:17, dongsheng@apache.org wrote:
>> Author: dongsheng
>> Date: Thu Dec 22 05:17:05 2011
>> New Revision: 1222040
>>
>> URL: http://svn.apache.org/viewvc?rev=1222040&view=rev
>> Log:
>> Making up for the missing single quotation mark.
>>
>> Obvious fix.
>>
>> Modified:
>> subversion/trunk/subversion/libsvn_client/diff.c
>>
>> Modified: subversion/trunk/subversion/libsvn_client/diff.c
>> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1222040&r1=1222039&r2=1222040&view=diff
>> ==============================================================================
>> --- subversion/trunk/subversion/libsvn_client/diff.c (original)
>> +++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 22 05:17:05 2011
>> @@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
>> *url1, *rev1, *rev2);
>> else
>> return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
>> - _("Diff targets '%s and '%s' were not found "
>> + _("Diff targets '%s' and '%s' were not found "
>> "in the repository at revisions '%ld' and "
>> "'%ld'"),
>> *url1, *url2, *rev1, *rev2);
>>
>>
>>
Re: svn commit: r1222040 -
/subversion/trunk/subversion/libsvn_client/diff.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Merge to 1.7.x?
On Thu, Dec 22, 2011, at 05:17, dongsheng@apache.org wrote:
> Author: dongsheng
> Date: Thu Dec 22 05:17:05 2011
> New Revision: 1222040
>
> URL: http://svn.apache.org/viewvc?rev=1222040&view=rev
> Log:
> Making up for the missing single quotation mark.
>
> Obvious fix.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/diff.c
>
> Modified: subversion/trunk/subversion/libsvn_client/diff.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1222040&r1=1222039&r2=1222040&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/diff.c (original)
> +++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 22 05:17:05 2011
> @@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
> *url1, *rev1, *rev2);
> else
> return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
> - _("Diff targets '%s and '%s' were not found "
> + _("Diff targets '%s' and '%s' were not found "
> "in the repository at revisions '%ld' and "
> "'%ld'"),
> *url1, *url2, *rev1, *rev2);
>
>
>
Re: svn commit: r1222040 -
/subversion/trunk/subversion/libsvn_client/diff.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Merge to 1.7.x?
On Thu, Dec 22, 2011, at 05:17, dongsheng@apache.org wrote:
> Author: dongsheng
> Date: Thu Dec 22 05:17:05 2011
> New Revision: 1222040
>
> URL: http://svn.apache.org/viewvc?rev=1222040&view=rev
> Log:
> Making up for the missing single quotation mark.
>
> Obvious fix.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/diff.c
>
> Modified: subversion/trunk/subversion/libsvn_client/diff.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1222040&r1=1222039&r2=1222040&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/diff.c (original)
> +++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 22 05:17:05 2011
> @@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
> *url1, *rev1, *rev2);
> else
> return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
> - _("Diff targets '%s and '%s' were not found "
> + _("Diff targets '%s' and '%s' were not found "
> "in the repository at revisions '%ld' and "
> "'%ld'"),
> *url1, *url2, *rev1, *rev2);
>
>
>