--- a/CVSSCMgr.st	Mon Jul 26 17:11:14 1999 +0200
+++ b/CVSSCMgr.st	Mon Jul 26 17:46:29 1999 +0200
@@ -1,6 +1,6 @@
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -11,11 +11,11 @@
 "
 
 AbstractSourceCodeManager subclass:#CVSSourceCodeManager
-	instanceVariableNames:''
-	classVariableNames:'Verbose CVSRoot CVSWorkDirectory RemoteCVS CVSBinDir
-		CVSModuleRoots CMD_checkout CVSTempDir'
-	poolDictionaries:''
-	category:'System-SourceCodeManagement'
+        instanceVariableNames:''
+        classVariableNames:'Verbose CVSRoot CVSWorkDirectory RemoteCVS CVSBinDir
+                CVSModuleRoots CMD_checkout CVSTempDir'
+        poolDictionaries:''
+        category:'System-SourceCodeManagement'
 !
 
 !CVSSourceCodeManager class methodsFor:'documentation'!
@@ -23,7 +23,7 @@
 copyright
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -555,7 +555,7 @@
         ].
 
         "now create the dummy file in the repository"
-        self import:path directory in:tempdir.
+        self import:moduleDir in:(tempdir construct:moduleDir).
 
         "remove the path, so that checkout works"
         (tempdir construct:moduleDir) recursiveRemove.
@@ -575,7 +575,7 @@
     "
 
     "Created: / 23.7.1999 / 19:14:28 / stefan"
-    "Modified: / 23.7.1999 / 19:53:48 / stefan"
+    "Modified: / 26.7.1999 / 17:43:35 / stefan"
 !
 
 createTempDirectory:packageDir forModule:moduleDir
@@ -621,8 +621,8 @@
 cvsTimeString:absoluteTime
     "convert an absoluteTime to a string suitable for the CVS/Entries file:
 
-			 123456789012345678901234
-			 Tue Dec 19 20:56:26 1995
+                         123456789012345678901234
+                         Tue Dec 19 20:56:26 1995
     "
 
     |date time stream|
@@ -635,7 +635,7 @@
     stream space.
 
     (#('Jan' 'Feb' 'Mar' 'Apr' 'May' 'Jun' 'Jul' 'Aug' 'Sep' 'Oct' 'Nov' 'Dec') 
-	at:(date month)) printOn:stream.
+        at:(date month)) printOn:stream.
     stream space.
 
     date day printOn:stream.
@@ -720,13 +720,13 @@
     "Modified: / 20.5.1998 / 16:30:12 / cg"
 !
 
-import:relativeFilename in:tempdir
-    "import the existing file named by relativeFilename in tempdir"
+import:repository in:tempdir
+    "import the existing tree in tempdir as repository"
 
     |cmd|
 
     cmd := 'import -m "checkin from stx browser" ', 
-           relativeFilename name, ' initialV initialR'.
+           repository, ' initialV initialR'.
     ^ self 
         executeCVSCommand:cmd 
         module:''
@@ -737,14 +737,14 @@
     "
       |f d|
       f := 'stefan/dummy/fasel'.
-      d := '/tmp' asFilename construct:f.
+      d := '/tmp/tt' asFilename construct:f.
       d directory recursiveMakeDirectory.
       d writeStream close.
-      self import:f asFilename in:'/tmp' asFilename
+      self import:'stefan' in:'/tmp/tt/stefan' asFilename
     "
 
     "Created: / 23.7.1999 / 19:19:34 / stefan"
-    "Modified: / 23.7.1999 / 19:42:00 / stefan"
+    "Modified: / 26.7.1999 / 17:46:29 / stefan"
 !
 
 releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
@@ -2971,6 +2971,6 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/CVSSCMgr.st,v 1.192 1999-07-26 15:11:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/CVSSCMgr.st,v 1.193 1999-07-26 15:46:29 stefan Exp $'
 ! !
 CVSSourceCodeManager initialize!

--- a/CVSSourceCodeManager.st	Mon Jul 26 17:11:14 1999 +0200
+++ b/CVSSourceCodeManager.st	Mon Jul 26 17:46:29 1999 +0200
@@ -1,6 +1,6 @@
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -11,11 +11,11 @@
 "
 
 AbstractSourceCodeManager subclass:#CVSSourceCodeManager
-	instanceVariableNames:''
-	classVariableNames:'Verbose CVSRoot CVSWorkDirectory RemoteCVS CVSBinDir
-		CVSModuleRoots CMD_checkout CVSTempDir'
-	poolDictionaries:''
-	category:'System-SourceCodeManagement'
+        instanceVariableNames:''
+        classVariableNames:'Verbose CVSRoot CVSWorkDirectory RemoteCVS CVSBinDir
+                CVSModuleRoots CMD_checkout CVSTempDir'
+        poolDictionaries:''
+        category:'System-SourceCodeManagement'
 !
 
 !CVSSourceCodeManager class methodsFor:'documentation'!
@@ -23,7 +23,7 @@
 copyright
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -555,7 +555,7 @@
         ].
 
         "now create the dummy file in the repository"
-        self import:path directory in:tempdir.
+        self import:moduleDir in:(tempdir construct:moduleDir).
 
         "remove the path, so that checkout works"
         (tempdir construct:moduleDir) recursiveRemove.
@@ -575,7 +575,7 @@
     "
 
     "Created: / 23.7.1999 / 19:14:28 / stefan"
-    "Modified: / 23.7.1999 / 19:53:48 / stefan"
+    "Modified: / 26.7.1999 / 17:43:35 / stefan"
 !
 
 createTempDirectory:packageDir forModule:moduleDir
@@ -621,8 +621,8 @@
 cvsTimeString:absoluteTime
     "convert an absoluteTime to a string suitable for the CVS/Entries file:
 
-			 123456789012345678901234
-			 Tue Dec 19 20:56:26 1995
+                         123456789012345678901234
+                         Tue Dec 19 20:56:26 1995
     "
 
     |date time stream|
@@ -635,7 +635,7 @@
     stream space.
 
     (#('Jan' 'Feb' 'Mar' 'Apr' 'May' 'Jun' 'Jul' 'Aug' 'Sep' 'Oct' 'Nov' 'Dec') 
-	at:(date month)) printOn:stream.
+        at:(date month)) printOn:stream.
     stream space.
 
     date day printOn:stream.
@@ -720,13 +720,13 @@
     "Modified: / 20.5.1998 / 16:30:12 / cg"
 !
 
-import:relativeFilename in:tempdir
-    "import the existing file named by relativeFilename in tempdir"
+import:repository in:tempdir
+    "import the existing tree in tempdir as repository"
 
     |cmd|
 
     cmd := 'import -m "checkin from stx browser" ', 
-           relativeFilename name, ' initialV initialR'.
+           repository, ' initialV initialR'.
     ^ self 
         executeCVSCommand:cmd 
         module:''
@@ -737,14 +737,14 @@
     "
       |f d|
       f := 'stefan/dummy/fasel'.
-      d := '/tmp' asFilename construct:f.
+      d := '/tmp/tt' asFilename construct:f.
       d directory recursiveMakeDirectory.
       d writeStream close.
-      self import:f asFilename in:'/tmp' asFilename
+      self import:'stefan' in:'/tmp/tt/stefan' asFilename
     "
 
     "Created: / 23.7.1999 / 19:19:34 / stefan"
-    "Modified: / 23.7.1999 / 19:42:00 / stefan"
+    "Modified: / 26.7.1999 / 17:46:29 / stefan"
 !
 
 releaseAndRemove:tempdir module:moduleDir outputTo:outputFilename
@@ -2971,6 +2971,6 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.192 1999-07-26 15:11:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.193 1999-07-26 15:46:29 stefan Exp $'
 ! !
 CVSSourceCodeManager initialize!