--- a/PerforceSourceCodeManager.st	Fri Jun 01 11:18:55 2012 +0200
+++ b/PerforceSourceCodeManager.st	Fri Jun 01 13:33:16 2012 +0200
@@ -1821,7 +1821,10 @@
     "/ $-Revision: rev $
     "/ $-Id:       fileName rev date time user state $
     "/
-    (firstWord = '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.25 2012-06-01 09:18:55 cg Exp $Id:' or:[firstWord = '§Id:']]]) ifTrue:[
+    (firstWord = ('$','Header:')        "/ WARNING: need to split the strings to prevent CVS from expanding them
+    or:[firstWord = ('§','Header:') 
+    or:[firstWord = ('$','Id:') 
+    or:[firstWord = ('§','Id:')]]]) ifTrue:[
         s skipSeparators.
         rest := s upToEnd.
         hashIndex := rest indexOf:$#.
@@ -1853,10 +1856,10 @@
      Timestamp now printOn:s format:'%h-%m-%s.%i'.
      versionInfo time:s contents.
      PerforceVersionInfo fromRCSString:versionInfo getVersionString.
-     PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.25 2012-06-01 09:18:55 cg Exp $'
+     PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.26 2012-06-01 11:33:16 cg Exp $'
     "
 
-    "Modified: / 22-10-2008 / 20:17:00 / cg"
+    "Modified: / 01-06-2012 / 13:32:40 / cg"
 !
 
 fromRepositoryPathName:something
@@ -1954,9 +1957,9 @@
 !PerforceSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.25 2012-06-01 09:18:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.26 2012-06-01 11:33:16 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.25 2012-06-01 09:18:55 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.26 2012-06-01 11:33:16 cg Exp $'
 ! !