--- a/PerforceSourceCodeManager.st	Thu May 09 13:50:49 2013 +0100
+++ b/PerforceSourceCodeManager.st	Fri May 31 00:35:32 2013 +0100
@@ -12,38 +12,38 @@
 "{ Package: 'stx:libbasic3' }"
 
 AbstractSourceCodeManager subclass:#PerforceSourceCodeManager
-    instanceVariableNames: ''
-    classVariableNames: 'PerforceExecutable PerforceModuleRoots PerforceClient
+	instanceVariableNames:''
+	classVariableNames:'PerforceExecutable PerforceModuleRoots PerforceClient
 		PerforcePort PerforceUser PerforcePassword PerforceTempDir
 		Verbose PerforceCommandSemaphore PerforceEnabled
 		PerforceWorkspaces'
-    poolDictionaries: ''
-    category: 'System-SourceCodeManagement'
+	poolDictionaries:''
+	category:'System-SourceCodeManagement'
 !
 
 Object subclass:#CheckInDefinition
-    instanceVariableNames: 'class packageDir classFileName sourceFileName logMessage
+	instanceVariableNames:'class packageDir classFileName sourceFileName logMessage
 		moduleName manager tempDirectory definitionClass workSpace
 		temporaryWorkSpace package reposRevisionInfoBeforeAction
 		reposRevisionInfoAfterAction revisionStringBeforeAction
 		fileContents'
-    classVariableNames: ''
-    poolDictionaries: ''
-    privateIn: PerforceSourceCodeManager
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:PerforceSourceCodeManager
 !
 
 ProceedableError subclass:#PerforceError
-    instanceVariableNames: ''
-    classVariableNames: ''
-    poolDictionaries: ''
-    privateIn: PerforceSourceCodeManager
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:PerforceSourceCodeManager
 !
 
 VersionInfo subclass:#PerforceVersionInfo
-    instanceVariableNames: 'repositoryPathName revisionNumber'
-    classVariableNames: ''
-    poolDictionaries: ''
-    privateIn: PerforceSourceCodeManager
+	instanceVariableNames:'repositoryPathName revisionNumber'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:PerforceSourceCodeManager
 !
 
 !PerforceSourceCodeManager class methodsFor:'documentation'!
@@ -62,7 +62,6 @@
 "
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'accessing'!
 
 flushPerforceWorkspaces
@@ -283,7 +282,6 @@
     "Modified: / 01-06-2012 / 11:14:15 / cg"
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'actions'!
 
 checkinClass:aClass fileName:classFileName directory:packageDir module:moduleDir logMessage:logMessage force:force
@@ -486,7 +484,6 @@
     ].
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'basic administration'!
 
 basicCheckinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMessage force:forceArg submit:doSubmit
@@ -990,7 +987,6 @@
     "Modified: / 21-12-2011 / 23:33:53 / cg"
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'private'!
 
 getCheckInDefinitionForClass:aClass
@@ -1073,7 +1069,6 @@
     ^PerforceVersionInfo
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'queries'!
 
 checkInInfoDialogClass
@@ -1323,9 +1318,16 @@
 perforceTmpDirectory
     "return the name of the tmp repository.
      That's the directory, where temporary files are created for checkin/checkout.
-     If nil, the system's default tempDirectory is used."
+     If nil, a directory under the system's default tempDirectory is used."
+
+    |d|
 
-    ^ (PerforceTempDir ? Filename tempDirectory pathName)
+    PerforceTempDir notNil ifTrue:[^ PerforceTempDir].
+    d := Filename tempDirectory / 'stx_p4'.
+    d exists ifFalse:[
+        d recursiveMakeDirectory.
+    ].
+    ^ d pathName
 
     "
      PerforceTempDir := nil
@@ -1363,7 +1365,6 @@
     "Modified: / 20-04-2011 / 12:49:41 / cg"
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'queries - settings'!
 
 getPerforceDefaultSettingsString
@@ -1493,7 +1494,6 @@
 "
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'subclass responsibility'!
 
 getExistingContainersInModule:aModule directory:aPackage
@@ -1522,7 +1522,6 @@
     self shouldImplement
 ! !
 
-
 !PerforceSourceCodeManager::CheckInDefinition methodsFor:'accessing'!
 
 classFileName
@@ -1621,7 +1620,6 @@
     workSpace := something.
 ! !
 
-
 !PerforceSourceCodeManager::CheckInDefinition methodsFor:'actions'!
 
 getBinaryRevision
@@ -1743,7 +1741,6 @@
     ^ Number readFrom:(ReadStream on:newestRevisionString) onError:nil
 ! !
 
-
 !PerforceSourceCodeManager::CheckInDefinition methodsFor:'queries'!
 
 definitionObjectString
@@ -1771,7 +1768,6 @@
     ^ (PackageId module:package directory:packageDir) asString. 
 ! !
 
-
 !PerforceSourceCodeManager::PerforceVersionInfo class methodsFor:'documentation'!
 
 documentation
@@ -1786,7 +1782,6 @@
 "
 ! !
 
-
 !PerforceSourceCodeManager::PerforceVersionInfo class methodsFor:'instance creation'!
 
 fromRCSString:aString
@@ -1846,7 +1841,7 @@
      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.32 2013-05-07 18:37:43 cg Exp $'
+     PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.33 2013-05-15 10:47:42 cg Exp $'
     "
 
     "Modified: / 01-06-2012 / 13:32:40 / cg"
@@ -1861,7 +1856,6 @@
     ^inst
 ! !
 
-
 !PerforceSourceCodeManager::PerforceVersionInfo methodsFor:'accessing'!
 
 repositoryPathName
@@ -1896,7 +1890,6 @@
     "Created: / 22-10-2008 / 20:50:39 / cg"
 ! !
 
-
 !PerforceSourceCodeManager::PerforceVersionInfo methodsFor:'queries'!
 
 getVersionString
@@ -1946,15 +1939,14 @@
     ^ stream contents
 ! !
 
-
 !PerforceSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.33 2013-05-15 10:47:42 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.32 2013-05-07 18:37:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.33 2013-05-15 10:47:42 cg Exp $'
 !
 
 version_HG