[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Resolve Conflicts with df error

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Thu, 01 Jan 2009 23:13:19 -0500

"Rock Sun" <daijun_at_gmail.com> writes:
> Sorry,I make a patch here:
> http://svn.haxx.se/dev/archive-2008-11/0420.shtml
> 2008/11/5 Rock Sun <daijun_at_gmail.com>
> Karl:
> I had report a bug on users list of Subversion.
> But no one response. Is my faults or something?
> Here is the archive url:
> http://www.nabble.com/Resolve-Conflicts-with-df-error-td20297813.html
> Sorry for trouble you.

Oh, it's okay. I'm following up to the dev list.

I've tested your patch against the latest Subversion, and it passes
'make check'. But I can't reproduce the problem (because my locale
doesn't have the same problems yours does), and I also can't see date
output in any diff headers. Can you tell us a command we can use to at
least see the effect of the patch? Or is lack of an error the only

Here's the latest patch with log message:

* subversion/libsvn_diff/diff_file.c
  (output_unified_default_hdr): Use non-locale-specific date format in
    diff headers, to avoid conversion problems.

Patch by: Rock Sun <daijun_at_gmail.com>

See http://www.nabble.com/Resolve-Conflicts-with-df-error-td20297813.html.

Index: subversion/libsvn_diff/diff_file.c
--- subversion/libsvn_diff/diff_file.c (revision 35011)
+++ subversion/libsvn_diff/diff_file.c (working copy)
@@ -1122,7 +1122,7 @@
   apr_time_exp_lt(&exploded_time, file_info.mtime);
   apr_strftime(time_buffer, &time_len, sizeof(time_buffer) - 1,
- "%a %b %e %H:%M:%S %Y", &exploded_time);
+ "%Y.%m.%d %H:%M:%S", &exploded_time);
   SVN_ERR(svn_utf_cstring_to_utf8(&utf8_timestr, time_buffer, pool));

Received on 2009-01-02 05:13:42 CET

This is an archived mail posted to the Subversion Dev mailing list.