--- a/CVSSourceCodeManager.st	Tue Jul 16 14:00:01 2013 +0100
+++ b/CVSSourceCodeManager.st	Thu Aug 01 10:23:03 2013 +0100
@@ -705,7 +705,7 @@
      If overwrite is true, an existing entry will be overwritten.
     "
 
-    |filename cvsRoot cvsDir name entries firstPart s path|
+    |filename cvsRoot cvsDir name entries firstPart entriesInStream path|
 
     filename := pathInRepository asFilename.
     cvsDir := (aDirectory asFilename construct:'CVS') recursiveMakeDirectory.
@@ -713,8 +713,8 @@
     name := filename baseName.
     firstPart := '/', name, '/'.
 
-    s := entries readStreamOrNil.
-    s isNil ifTrue:[
+    entriesInStream := entries readStreamOrNil.
+    entriesInStream isNil ifTrue:[
         "/
         "/ no Repository yet, create one
         "/
@@ -729,38 +729,38 @@
         "/ create Repository
         "/ (notice, contents must be a Unix filename ...
 
-        s := (cvsDir construct:'Repository') writeStream.
+        entriesInStream := (cvsDir construct:'Repository') writeStream.
         path := Filename components:filename directory name.
         path := path asStringWith:$/.
-        s nextPutLine:(root, '/', path).
-        s syncData; close.
+        entriesInStream nextPutLine:(root, '/', path).
+        entriesInStream syncData; close.
 
         "/ make new Entries file.
-        s := entries writeStream.
+        entriesInStream := entries writeStream.
     ] ifFalse:[
         |newName newStream line|
 
         newName := Filename newTemporaryIn:cvsDir.
         newStream := newName writeStream.
-        [(line := s nextLine) notNil] whileTrue:[
+        [(line := entriesInStream nextLine) notNil] whileTrue:[
             (line findString:firstPart) ~= 1 ifTrue:[
                 "/ we have found an entry for ourself.
                 "/ If we do not want to overwrite it, clean up everything and return.
                 overwrite ifFalse:[
                     newName remove.
                     newStream close.
-                    s close.
+                    entriesInStream close.
                     ^ self
                 ].
                 newStream nextPutLine:line
             ].
         ].
         newName renameTo:entries.
-        s close.
-        s := newStream.
+        entriesInStream close.
+        entriesInStream := newStream.
     ].
-    s nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
-    s syncData; close.
+    entriesInStream nextPutLine:firstPart, rev, '/', date, '/', special, '/'.
+    entriesInStream syncData; close.
 
     "
         self createEntryFor:'foo/xxx/yyy' in:'foo/xxx' revision:'1.22' date:'dummy' special:''
@@ -814,7 +814,7 @@
             OperatingSystem isVMSlike ifTrue:[
                 self error:'VMS case not yet implemented'
             ].
-            unixPath := path name copy replaceAll:$\ with:$/
+            unixPath := path name copyReplaceAll:$\ with:$/
         ].
 
         (self checkOut:unixPath module:moduleDir in:tempdir) ifFalse:[
@@ -875,7 +875,7 @@
 
     "Modified: / 26-07-1999 / 17:43:35 / stefan"
     "Created: / 18-01-2000 / 20:55:52 / cg"
-    "Modified: / 29-08-2006 / 13:17:32 / cg"
+    "Modified: / 16-07-2013 / 19:49:26 / cg"
 !
 
 createTempDirectory:packageDir forModule:moduleDir
@@ -2164,6 +2164,8 @@
             "/
             (cmdOut exists and:[cmdOut fileSize > 0]) ifTrue:[
                 whatHappened := cmdOut contentsOfEntireFile asString.
+            ] ifFalse:[
+                self breakPoint:#cg.
             ].
         ].
 
@@ -2648,7 +2650,7 @@
 
     "Created: / 11-09-1996 / 16:16:11 / cg"
     "Modified: / 26-02-1998 / 17:34:16 / stefan"
-    "Modified: / 11-09-2012 / 18:43:38 / cg"
+    "Modified: / 27-07-2013 / 11:43:13 / cg"
 !
 
 checkoutModule:aModule directory:aPackage andDo:aBlock
@@ -5313,11 +5315,11 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.471 2013-07-07 10:57:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.473 2013-07-27 09:56:40 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.471 2013-07-07 10:57:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.473 2013-07-27 09:56:40 cg Exp $'
 !
 
 version_HG