You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/03/02 11:46:47 UTC
svn commit: r917950 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: philip
Date: Tue Mar 2 10:46:46 2010
New Revision: 917950
URL: http://svn.apache.org/viewvc?rev=917950&view=rev
Log:
* subversion/libsvn_client/merge.c (log_find_operative_revs): Use %ld
rather than %d to format svn_revnum_t.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=917950&r1=917949&r2=917950&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar 2 10:46:46 2010
@@ -8705,7 +8705,8 @@
rel_path, pool);
SVN_ERR(svn_mergeinfo_parse(&log_entry_as_mergeinfo,
- apr_psprintf(pool, "%s:%d", path, revision),
+ apr_psprintf(pool, "%s:%ld",
+ path, revision),
pool));
SVN_ERR(mergeinfo_in_catalog(&in_catalog, &subtree_missing_this_rev,
@@ -8739,7 +8740,8 @@
}
SVN_ERR(svn_mergeinfo_parse(&log_entry_as_mergeinfo,
- apr_psprintf(pool, "%s:%d", missing_path, revision),
+ apr_psprintf(pool, "%s:%ld",
+ missing_path, revision),
log_baton->result_pool));
unmerged_for_key = apr_hash_get(log_baton->unmerged_catalog,
subtree_missing_this_rev,
RE: svn commit: r917950 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Stefan Sperling [mailto:stsp@elego.de]
> Sent: dinsdag 2 maart 2010 12:34
> To: dev@subversion.apache.org
> Subject: Re: svn commit: r917950 -
> /subversion/trunk/subversion/libsvn_client/merge.c
>
> On Tue, Mar 02, 2010 at 10:46:47AM -0000, philip@apache.org wrote:
> > Author: philip
> > Date: Tue Mar 2 10:46:46 2010
> > New Revision: 917950
> >
> > URL: http://svn.apache.org/viewvc?rev=917950&view=rev
> > Log:
> > * subversion/libsvn_client/merge.c (log_find_operative_revs): Use %ld
> > rather than %d to format svn_revnum_t.
>
> What about using this?
> subversion/include/svn_types.h:#define SVN_REVNUM_T_FMT "ld"
/** Originally intended to be used in printf()-style functions to format
* revision numbers. Deprecated due to incompatibilities with language
* translation tools (e.g. gettext).
*
* New code should use a bare "%ld" format specifier for formatting revision
* numbers.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
#define SVN_REVNUM_T_FMT "ld"
Bert
Re: svn commit: r917950 -
/subversion/trunk/subversion/libsvn_client/merge.c
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Mar 02, 2010 at 11:42:25AM +0000, Philip Martin wrote:
> Philip Martin <ph...@wandisco.com> writes:
> > /** Originally intended to be used in printf()-style functions to format
> > * revision numbers. Deprecated due to incompatibilities with language
> > * translation tools (e.g. gettext).
> > *
> > * New code should use a bare "%ld" format specifier for formatting revision
> > * numbers.
> > *
> > * @deprecated Provided for backward compatibility with the 1.0 API.
> > */
Ooops, I didn't see that comment. I was using grep...
> Perhaps that doesn't apply in this case? Is this string translated?
> If it's valid to use it then we should update the svn_types.h to not
> deprecate it.
It's been deprecated for quite some time, so I'd say just leave it be.
Thanks,
Stefan
Re: svn commit: r917950 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Philip Martin <ph...@codematters.co.uk>.
Philip Martin <ph...@wandisco.com> writes:
> Stefan Sperling <st...@elego.de> writes:
>
>> On Tue, Mar 02, 2010 at 10:46:47AM -0000, philip@apache.org wrote:
>>> Author: philip
>>> Date: Tue Mar 2 10:46:46 2010
>>> New Revision: 917950
>>>
>>> URL: http://svn.apache.org/viewvc?rev=917950&view=rev
>>> Log:
>>> * subversion/libsvn_client/merge.c (log_find_operative_revs): Use %ld
>>> rather than %d to format svn_revnum_t.
>>
>> What about using this?
>> subversion/include/svn_types.h:#define SVN_REVNUM_T_FMT "ld"
>
> /** Originally intended to be used in printf()-style functions to format
> * revision numbers. Deprecated due to incompatibilities with language
> * translation tools (e.g. gettext).
> *
> * New code should use a bare "%ld" format specifier for formatting revision
> * numbers.
> *
> * @deprecated Provided for backward compatibility with the 1.0 API.
> */
Perhaps that doesn't apply in this case? Is this string translated?
If it's valid to use it then we should update the svn_types.h to not
deprecate it.
--
Philip
Re: svn commit: r917950 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Philip Martin <ph...@wandisco.com>.
Stefan Sperling <st...@elego.de> writes:
> On Tue, Mar 02, 2010 at 10:46:47AM -0000, philip@apache.org wrote:
>> Author: philip
>> Date: Tue Mar 2 10:46:46 2010
>> New Revision: 917950
>>
>> URL: http://svn.apache.org/viewvc?rev=917950&view=rev
>> Log:
>> * subversion/libsvn_client/merge.c (log_find_operative_revs): Use %ld
>> rather than %d to format svn_revnum_t.
>
> What about using this?
> subversion/include/svn_types.h:#define SVN_REVNUM_T_FMT "ld"
/** Originally intended to be used in printf()-style functions to format
* revision numbers. Deprecated due to incompatibilities with language
* translation tools (e.g. gettext).
*
* New code should use a bare "%ld" format specifier for formatting revision
* numbers.
*
* @deprecated Provided for backward compatibility with the 1.0 API.
*/
--
Philip
Re: svn commit: r917950 -
/subversion/trunk/subversion/libsvn_client/merge.c
Posted by Stefan Sperling <st...@elego.de>.
On Tue, Mar 02, 2010 at 10:46:47AM -0000, philip@apache.org wrote:
> Author: philip
> Date: Tue Mar 2 10:46:46 2010
> New Revision: 917950
>
> URL: http://svn.apache.org/viewvc?rev=917950&view=rev
> Log:
> * subversion/libsvn_client/merge.c (log_find_operative_revs): Use %ld
> rather than %d to format svn_revnum_t.
What about using this?
subversion/include/svn_types.h:#define SVN_REVNUM_T_FMT "ld"
Stefan
>
> Modified:
> subversion/trunk/subversion/libsvn_client/merge.c
>
> Modified: subversion/trunk/subversion/libsvn_client/merge.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=917950&r1=917949&r2=917950&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/merge.c (original)
> +++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar 2 10:46:46 2010
> @@ -8705,7 +8705,8 @@
> rel_path, pool);
>
> SVN_ERR(svn_mergeinfo_parse(&log_entry_as_mergeinfo,
> - apr_psprintf(pool, "%s:%d", path, revision),
> + apr_psprintf(pool, "%s:%ld",
> + path, revision),
> pool));
>
> SVN_ERR(mergeinfo_in_catalog(&in_catalog, &subtree_missing_this_rev,
> @@ -8739,7 +8740,8 @@
> }
>
> SVN_ERR(svn_mergeinfo_parse(&log_entry_as_mergeinfo,
> - apr_psprintf(pool, "%s:%d", missing_path, revision),
> + apr_psprintf(pool, "%s:%ld",
> + missing_path, revision),
> log_baton->result_pool));
> unmerged_for_key = apr_hash_get(log_baton->unmerged_catalog,
> subtree_missing_this_rev,
>
--
printf("Eh???/n");