Author: hwright
Date: Sat Aug 6 15:15:44 2011
New Revision: 1154527
URL: http://svn.apache.org/viewvc?rev=1154527&view=rev
Log:
Merge r1154461 from trunk:
* r1154461
Initialize the is_binary member of the svn_wc_conflict_description2_t
correctly, not unconditionally to false.
Justification:
Easy and obvious fix. Without this, the TSVN UI shows the wrong info and
doesn't resolve conflicts correctly.
Votes:
+1: steveking, rhuijben, arfrever
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/merge.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 6 15:15:44 2011
@@ -55,4 +55,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154023,1154461
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154527&r1=1154526&r2=1154527&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Aug 6 15:15:44 2011
@@ -183,12 +183,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1154461
- Initialize the is_binary member of the svn_wc_conflict_description2_t
- correctly, not unconditionally to false.
- Justification:
- Easy and obvious fix. Without this, the TSVN UI shows the wrong info and
- doesn't resolve conflicts correctly.
- Votes:
- +1: steveking, rhuijben, arfrever
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/merge.c?rev=1154527&r1=1154526&r2=1154527&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/merge.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/merge.c Sat Aug 6 15:15:44
2011
@@ -814,7 +814,7 @@ setup_text_conflict_desc(const char *lef
svn_wc_conflict_description2_t *cdesc;
cdesc = svn_wc_conflict_description_create_text2(target_abspath, pool);
- cdesc->is_binary = FALSE;
+ cdesc->is_binary = is_binary;
cdesc->mime_type = (mimeprop && mimeprop->value)
? mimeprop->value->data : NULL,
cdesc->base_abspath = left_abspath;
