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/03/17 14:17:05 UTC
svn commit: r1667297 - /subversion/branches/1.8.x/STATUS
Author: rhuijben
Date: Tue Mar 17 13:17:05 2015
New Revision: 1667297
URL: http://svn.apache.org/r1667297
Log:
* STATUS: Approve addition of a regression test, and by that a backport nomination.
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=1667297&r1=1667296&r2=1667297&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Mar 17 13:17:05 2015
@@ -47,17 +47,6 @@ Candidate changes:
+0: danielsh (hard to review all potential causes of expanded_size==0 in
7*3*2 cases (1.1â¦1.8) à (file/dir/prop rep) à (plain/delta))
- * 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: stsp, brane
- +1: rhuijben (without r1665874)
-
* r1619380, r1619393, r1660186
Fix diff of a locally copied directory with props: it showed all props
as added instead of a diff against the copy-from props.
@@ -152,3 +141,13 @@ Approved changes:
^/subversion/branches/1.8.x-r1664684
Votes:
+1: rhuijben, stsp, brane
+
+ * 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: stsp, brane, rhuijben