[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: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA_at_GMail.Com>
Date: Fri, 2 Jan 2009 08:33:24 +0100

2009-01-02 05:13:19 Karl Fogel napisaƂ(a):
> "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?

$ svnadmin create repo
$ svn co file://$(pwd)/repo wc
Checked out revision 0.
$ cd wc
$ touch file
$ svn add file
A file
$ svn ci -m ""
Adding file
Transmitting file data .
Committed revision 1.
$ echo a > file
$ svn ci -m ""
Sending file
Transmitting file data .
Committed revision 2.
$ svn up -r1
U file
Updated to revision 1.
$ echo b > file
$ svn up
Conflict discovered in 'file'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: df
--- .svn/text-base/file.svn-base Fri Jan 2 08:02:36 2009
+++ .svn/tmp/tempfile.tmp Fri Jan 2 08:02:44 2009
@@ -0,0 +1,5 @@
+<<<<<<< .mine
+b
+=======
+a
+>>>>>>> .r2
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options:

> Or is lack of an error the only
> effect?
>
> 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);

It looks rather like a workaround. Maybe GBK->UTF-8 conversion works
incorrectly on Windows...

>
> SVN_ERR(svn_utf_cstring_to_utf8(&utf8_timestr, time_buffer, pool));
>

-- 
Arfrever Frehtes Taifersar Arahesis
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=999400

Received on 2009-01-02 08:35:51 CET

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