You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2015/02/16 23:07:30 UTC

svn commit: r1660223 - /subversion/branches/1.8.x/STATUS

Author: rhuijben
Date: Mon Feb 16 22:07:29 2015
New Revision: 1660223

URL: http://svn.apache.org/r1660223
Log:
* STATUS: Nominate r1660220.

Modified:
    subversion/branches/1.8.x/STATUS

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1660223&r1=1660222&r2=1660223&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Feb 16 22:07:29 2015
@@ -125,6 +125,14 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
+ * r1660220
+   Don't leave conflict markers on files that are moved
+   Justification:
+     Without this patch property or text conflicted files that are moved
+     leave dangling conflict markers in the old location. Easy fix.
+   Votes:
+     +1: rhuijben
+
 Veto-blocked changes:
 =====================