Item10629: Make sure Compare demo works

The Sandbox/CompareRevisionAddOnDemoTopic must remain at rev 2. And buildcontrib needs to have an exception so that it doesn't reset it git-svn-id: http://svn.foswiki.org/trunk@13194 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 23, 2011 · 8a9edb3 · 8a9edb3
1 parent 03745d1
commit 8a9edb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/BuildContrib/lib/Foswiki/Contrib/Build.pm b/BuildContrib/lib/Foswiki/Contrib/Build.pm
@@ -1103,7 +1103,8 @@ sub filter_txt {
             my ( $this, $text ) = @_;
 
             # Replace the version (SVN Rev or wrongly saved number) with rev 1.
-            $text =~ s/^(%META:TOPICINFO{.*version=").*?(".*}%)$/${1}1$2/m;
+            # Item10629: Must preserve version for CompareRevisionAddOnDemoTopic, or nothing to demo
+            $text =~ s/^(%META:TOPICINFO{.*version=").*?(".*}%)$/${1}1$2/m unless $from =~ m/CompareRevisionsAddOnDemoTopic.txt$/;
             $text =~ s/%\$(\w+)%/&_expand($this,$1)/geo;
             return $text;
         }

diff --git a/CompareRevisionsAddOn/data/Sandbox/CompareRevisionsAddOnDemoTopic.txt b/CompareRevisionsAddOn/data/Sandbox/CompareRevisionsAddOnDemoTopic.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1298533812" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1298533812" format="1.1" version="2"}%
 ---+ This is the title
 
 Here is a changed paragraph. Lorem Ipsum dolor sit amet, conecteur adipiscing felix elit.