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:03 UTC

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

Author: stsp
Date: Wed Mar 11 16:14:03 2015
New Revision: 1665925

URL: http://svn.apache.org/r1665925
Log:
* STATUS (1.8.x): Vote for 1.8.x-r1660220 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=1665925&r1=1665924&r2=1665925&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1660220/STATUS (original)
+++ subversion/branches/1.8.x-r1660220/STATUS Wed Mar 11 16:14:03 2015
@@ -55,13 +55,16 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
- * r1660220
+ * r1660220, r1665874
    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: rhuijben
+     +1: stsp
+     +1: rhuijben (without r1665874)
 
  * r1532287
    Simplify Windows resource compilation to avoid warnings