Author: steveking
Date: Sat Aug 6 08:51:08 2011
New Revision: 1154463
URL: http://svn.apache.org/viewvc?rev=1154463&view=rev
Log:
* STATUS: Propose r1154461 for backport to 1.7.0
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1154463&r1=1154462&r2=1154463&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Aug 6 08:51:08 2011
@@ -119,6 +119,15 @@ Candidate changes:
Votes:
+1: rhuijben
+ * 1154461
+ 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
+
Veto-blocked changes:
=====================
