diff --git a/BuildContrib/lib/Foswiki/Contrib/Build.pm b/BuildContrib/lib/Foswiki/Contrib/Build.pm index 89cbc187ce..d6fa176747 100644 --- 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 index 8b55965023..c7e7139234 100644 --- 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.