[TWiki-Dev] [SVN] StephaneLenclud r16681 - twiki/trunk/PerforcePlugin/lib/TWiki/Plugins

[<de...@de...>]

Author: StephaneLenclud
Date: 2008-04-16 04:47:40 -0500 (Wed, 16 Apr 2008)
New Revision: 16681
Trac url: http://develop.twiki.org/trac/changeset/16681

Modified:
   twiki/trunk/PerforcePlugin/lib/TWiki/Plugins/PerforcePlugin.pm
Log:
Item5354: TWiki:Plugins.PerforcePlugin.
Fixing issue with integration line parsing in "pending for integration feature"

Modified: twiki/trunk/PerforcePlugin/lib/TWiki/Plugins/PerforcePlugin.pm
===================================================================
--- twiki/trunk/PerforcePlugin/lib/TWiki/Plugins/PerforcePlugin.pm	2008-04-16 05:34:02 UTC (rev 16680)
+++ twiki/trunk/PerforcePlugin/lib/TWiki/Plugins/PerforcePlugin.pm	2008-04-16 09:47:40 UTC (rev 16681)
@@ -83,7 +83,7 @@
 # This is a free-form string you can use to "name" your own plugin version.
 # It is *not* used by the build automation tools, but is reported as part
 # of the version number in PLUGINDESCRIPTIONS.
-$RELEASE = '0.7';
+$RELEASE = '0.8';
 
 # Short description of this plugin
 # One line description, is shown in the %TWIKIWEB%.TextFormattingRules topic:
@@ -447,14 +447,14 @@
 		my $fromVersion1; 
 		my $fromVersion2; 
 	
-		if ($line=~/^(.+?) - .*integrate from (.+?)#(\d+),#(\d+)$/)
+		if ($line=~/^(.+?) - .* from (.+?)#(\d+),#(\d+)$/)
 			{
 			$toFile=$1;	
 			$fromFile=$2;	
 			$fromVersion1=$3; 
 			$fromVersion2=$4; 			
 			}
-		elsif ($line=~/^(.+?) - .*integrate from\s+(.+?)#(\d+)$/)
+		elsif ($line=~/^(.+?) - .* from\s+(.+?)#(\d+)$/)
 			{
 			$toFile=$1;	
 			$fromFile=$2;