--- a/CVSSourceCodeManager.st	Wed Dec 15 11:32:43 2004 +0100
+++ b/CVSSourceCodeManager.st	Tue Dec 21 11:53:39 2004 +0100
@@ -1179,7 +1179,7 @@
     |tempdir cmd checkoutName logMsg revision logTmp 
      cmdOut whatHappened s  idx changeLog changesAsLogged l 
      newRevision  msg answer didMerge
-     mySource mergedSource modulePath time 
+     modulePath time 
      editor checkInRepaired didAccept emphasizedText repairedText out 
      emSep comment|
 
@@ -1340,6 +1340,8 @@
             "/
             Transcript showCR:'checking in ' , containerFilename , ' ...'
         ] ifFalse:[
+            | mySource mergedSource |
+
             "/
             "/ someone else has changed things in the meanwhile, but there is no conflict
             "/ and version have been merged.
@@ -1656,7 +1658,7 @@
     |tempdir cmd checkoutName logMsg revision logTmp 
      cmdOut whatHappened s entry idx changeLog changesAsLogged l 
      newRevision newString binRevision className msg answer didMerge
-     mySource mergedSource modulePath time 
+     modulePath time 
      editor checkInRepaired checkInNew didAccept emphasizedText repairedText out 
      emSep comment force|
 
@@ -1879,6 +1881,8 @@
             "/
             Transcript showCR:'checking in ' , className , ' ...'
         ] ifFalse:[
+            |mySource mergedSource |
+
             "/
             "/ someone else has changed things in the meanwhile, but there is no conflict
             "/ and version have been merged.
@@ -2096,9 +2100,9 @@
                 "/
                 [
                     out := (tempdir construct:checkoutName) writeStream.
-                    out nextPutAll:(mySource asString string).
+                    cls fileOutOn:out withTimeStamp:false.
+                    out close.
                     didAccept := true.
-                    out close.
                     checkInNew := checkInRepaired := true.
                 ] on:FileStream openErrorSignal do:[:ex|
                     self warn:'could not write file ' , (tempdir constructString:checkoutName).
@@ -4477,7 +4481,7 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.289 2004-12-15 10:32:43 penk Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.290 2004-12-21 10:53:39 ca Exp $'
 ! !
 
 CVSSourceCodeManager initialize!