Merge jv
authorMerge Script
Sat, 02 Apr 2016 06:55:21 +0200
branchjv
changeset 3975 670fd6e04c95
parent 3973 e0c2353a205b (current diff)
parent 3974 0d6e71243042 (diff)
child 3980 8c574e894f77
Merge
SourceCodeManagerUtilities.st
--- a/SourceCodeManagerUtilities.st	Fri Apr 01 06:37:19 2016 +0200
+++ b/SourceCodeManagerUtilities.st	Sat Apr 02 06:55:21 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2000 eXept Software AG
               All Rights Reserved
@@ -3379,9 +3377,11 @@
     logMessage notNil ifTrue:[  
         logMessage := logMessage asSingleByteStringReplaceInvalidWith:$?
     ].
-    reasonLine notNil ifTrue:[
-        logMessage := reasonLine , '\' withCRs , (logMessage ? '')
+    reasonLine isNil ifTrue:[
+        reasonLine := '#OTHER'. 
     ].
+    logMessage := reasonLine , ' by ',OperatingSystem getLoginName,'\' withCRs 
+                  , (logMessage ? '').
     aBlock value:logMessage value:checkinInfo.
     ^ true