--- a/PerforceSourceCodeManager.st Thu Sep 29 21:43:34 2011 +0200
+++ b/PerforceSourceCodeManager.st Thu Sep 29 21:43:58 2011 +0200
@@ -1379,7 +1379,6 @@
!
initialCheckinFor:checkInDefinition
-
|modulePath checkoutName fullFileName classFileName packageDir moduleName logMsg force s class cmd result|
modulePath := checkInDefinition modulePath.
@@ -1392,6 +1391,7 @@
force := checkInDefinition force.
(class binaryRevision notNil) ifTrue:[
+ "/ the class is not a new one (either coming from another SCM or it was removed from this repository)
(Dialog confirm:('Someone seems to have removed the source container for ',class name,'\\Force new checkin ?') withCRs) ifTrue:[
class setBinaryRevision:nil.
^ self checkinClass:class fileName:classFileName directory:packageDir module:moduleName logMessage:logMsg force:force.
@@ -1415,6 +1415,8 @@
^ false
].
^ self submitModule:moduleName inDirectory:checkInDefinition tempDirectory logMessage:logMsg workSpaceDefinition:checkInDefinition workSpaceDefinition.
+
+ "Modified (format): / 29-09-2011 / 15:46:57 / cg"
!
mergeOrResolveConflictsFor:checkInDefinition
@@ -2343,7 +2345,7 @@
^ nil
"
- PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.11 2011-05-20 10:32:09 stefan Exp $'
+ PerforceVersionInfo fromRCSString:'$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.12 2011-09-29 19:43:58 cg Exp $'
"
"Modified: / 22-10-2008 / 20:17:00 / cg"
@@ -2496,7 +2498,7 @@
!PerforceSourceCodeManager class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.11 2011-05-20 10:32:09 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.12 2011-09-29 19:43:58 cg Exp $'
! !
PerforceSourceCodeManager initialize!