Title: [opsview] [9736] Delete the whole mergeinfo property if svn st lists some
Revision
9736
Author
tvoon
Date
2012-08-07 16:52:34 +0100 (Tue, 07 Aug 2012)

Log Message

Delete the whole mergeinfo property if svn st lists some
modifications around here

Modified Paths

Modified: trunk/tools/svn_revert_mergeinfo
===================================================================
--- trunk/tools/svn_revert_mergeinfo	2012-08-07 15:11:35 UTC (rev 9735)
+++ trunk/tools/svn_revert_mergeinfo	2012-08-07 15:52:34 UTC (rev 9736)
@@ -7,7 +7,7 @@
 my @revert;
 foreach $_ (@files) {
     chomp;
-    next unless /^ M\s+(.*)$/;
+    next unless /^.M\s+(.*)$/;
     my $f = $1;
     next if $f eq ".";
 
@@ -15,5 +15,5 @@
     push @revert, $f;
 }
 if (@revert) {
-    system( "svn", "revert", @revert );
+    system( "svn", "propdel", "svn:mergeinfo", $_ ) for @revert;
 }

_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to