[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

enforcer contrib script seems to be broken with svn 1.8

From: Arkadiusz Miśkiewicz <arekm_at_maven.pl>
Date: Tue, 4 Mar 2014 12:18:38 +0100

contrib/enforcer fails here (with svn 1.8)

It was dying on this below in line "assert state in (100, 300)"

[Added: test/100_5650.JPG
===================================================================
(Binary files differ)

Index: test/100_5650.JPG
===================================================================
--- test/100_5650.JPG 2014-03-04 10:42:48 UTC (rev 13847)
+++ test/100_5650.JPG 2014-03-04 10:51:05 UTC (txn 13847-bhp)

Property changes on: test/100_5650.JPG
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/jpeg
\ No newline at end of property

My workaround/fix:

--- enforcer.org 2013-02-25 20:27:19.000000000 +0100
+++ enforcer 2014-03-04 12:05:46.640157435 +0100
@@ -320,7 +320,7 @@ try:
                 filename = line[colon+2:]
 
                 if action in (
- "Modified",
+ "Modified", "Index",
                     "Added", "Deleted", "Copied",
                     "Property changes on",
                 ):
@@ -341,6 +341,7 @@ try:
                         filename = destination_filename
 
                     if action == "Modified" : state = 10
+ elif action == "Index" : state = 10
                     elif action == "Added" : state = 10
                     elif action == "Deleted" : state = 10
                     elif action == "Copied" : state = 20
@@ -440,6 +441,9 @@ try:
                     break
 
             else:
+ if line.startswith('## '):
+ break
+
                 for prefix, verify in (
                     (" - ", verify_property_line_removed),
                     (" + ", verify_property_line_added)

-- 
Arkadiusz Miśkiewicz, arekm / maven.pl
Received on 2014-03-04 13:16:53 CET

This is an archived mail posted to the Subversion Dev mailing list.