You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/05/14 18:57:21 UTC
svn commit: r1482456 - in /subversion/branches/1.8.x: ./ STATUS
subversion/libsvn_wc/props.c
Author: breser
Date: Tue May 14 16:57:21 2013
New Revision: 1482456
URL: http://svn.apache.org/r1482456
Log:
Merge r1481981 from trunk:
* r1481981
Don't destroy localised strings in .prej files by converting them to ASCII.
Justification:
The .prej files are unreadable.
Votes:
+1: mattiase (non-binding), stsp, rhuijben, cmpilato, breser, julianfoad
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_wc/props.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1481981
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482456&r1=1482455&r2=1482456&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:57:21 2013
@@ -84,10 +84,3 @@ Approved changes:
# that would restart the soak should not be added unless they are resolving
# blocking issues. If in doubt see this link for details:
# http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-
- * r1481981
- Don't destroy localised strings in .prej files by converting them to ASCII.
- Justification:
- The .prej files are unreadable.
- Votes:
- +1: mattiase (non-binding), stsp, rhuijben, cmpilato, breser, julianfoad
Modified: subversion/branches/1.8.x/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/props.c?rev=1482456&r1=1482455&r2=1482456&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/props.c Tue May 14 16:57:21 2013
@@ -81,12 +81,10 @@ append_prop_conflict(svn_stream_t *strea
/* TODO: someday, perhaps prefix each conflict_description with a
timestamp or something? */
const svn_string_t *conflict_desc;
- const char *native_text;
SVN_ERR(prop_conflict_from_skel(&conflict_desc, prop_skel, pool, pool));
- native_text = svn_utf_cstring_from_utf8_fuzzy(conflict_desc->data, pool);
- return svn_stream_puts(stream, native_text);
+ return svn_stream_puts(stream, conflict_desc->data);
}
/*---------------------------------------------------------------------*/
@@ -614,12 +612,26 @@ prop_conflict_from_skel(const svn_string
const char *mine_marker = _("<<<<<<< (local property value)");
const char *incoming_marker = _(">>>>>>> (incoming property value)");
const char *separator = "=======";
+ svn_string_t *original_ascii =
+ svn_string_create(svn_utf_cstring_from_utf8_fuzzy(original->data,
+ scratch_pool),
+ scratch_pool);
+ svn_string_t *mine_ascii =
+ svn_string_create(svn_utf_cstring_from_utf8_fuzzy(mine->data,
+ scratch_pool),
+ scratch_pool);
+ svn_string_t *incoming_ascii =
+ svn_string_create(svn_utf_cstring_from_utf8_fuzzy(incoming->data,
+ scratch_pool),
+ scratch_pool);
style = svn_diff_conflict_display_modified_latest;
stream = svn_stream_from_stringbuf(buf, scratch_pool);
SVN_ERR(svn_stream_skip(stream, buf->len));
SVN_ERR(svn_diff_mem_string_output_merge2(stream, diff,
- original, mine, incoming,
+ original_ascii,
+ mine_ascii,
+ incoming_ascii,
NULL, mine_marker,
incoming_marker, separator,
style, scratch_pool));