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

Posted to commits@subversion.apache.org by st...@apache.org on 2015/03/11 17:14:58 UTC

svn commit: r1665927 - /subversion/branches/1.8.x-r1660220/STATUS

Author: stsp
Date: Wed Mar 11 16:14:58 2015
New Revision: 1665927

URL: http://svn.apache.org/r1665927
Log:
Revert r1665925, committed to the wrong branch.

Modified:
    subversion/branches/1.8.x-r1660220/STATUS

Modified: subversion/branches/1.8.x-r1660220/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1660220/STATUS?rev=1665927&r1=1665926&r2=1665927&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1660220/STATUS (original)
+++ subversion/branches/1.8.x-r1660220/STATUS Wed Mar 11 16:14:58 2015
@@ -55,16 +55,13 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
- * r1660220, r1665874
+ * r1660220
    Don't leave conflict markers on files that are moved
-   Branch:
-     ^/subversion/branches/1.8.x-r1660220
    Justification:
      Without this patch property or text conflicted files that are moved
      leave dangling conflict markers in the old location. Easy fix.
    Votes:
-     +1: stsp
-     +1: rhuijben (without r1665874)
+     +1: rhuijben
 
  * r1532287
    Simplify Windows resource compilation to avoid warnings