--- a/SourceCodeManagerUtilities.st	Fri Feb 24 11:40:16 2017 +0100
+++ b/SourceCodeManagerUtilities.st	Fri Feb 24 11:41:11 2017 +0100
@@ -995,7 +995,44 @@
     "Modified: / 17-02-2011 / 10:20:14 / cg"
 ! !
 
-!SourceCodeManagerUtilities methodsFor:'utilities-cvs'!
+!SourceCodeManagerUtilities methodsFor:'utilities-encoding'!
+
+guessEncodingOfFile:aFilename
+    "look for a string
+        encoding #name
+     or:
+        encoding: name
+     within the given buffer 
+     (which is usually the first few bytes of a textFile).
+     If that's not found, use heuristics (in CharacterArray) to guess."
+
+    <resource: #obsolete>
+
+    self obsoleteMethodWarning:'ask CharacterEncoder'.
+    ^ CharacterEncoder guessEncodingOfFile:aFilename
+
+    "
+     SourceCodeManagerUtilities guessEncodingOfFile:'../../libview2/resources/ApplicationModel_de.rs' asFilename
+     SourceCodeManagerUtilities guessEncodingOfFile:'../../libview2/resources/ApplicationModel_ru.rs' asFilename
+    "
+
+    "Modified (comment): / 14-01-2012 / 20:54:35 / cg"
+!
+
+guessEncodingOfStream:aStream
+    "look for a string of the form
+            encoding #name
+     or:
+            encoding: name
+     in the first few bytes of aStream."
+
+    <resource: #obsolete>
+
+    self obsoleteMethodWarning:'ask CharacterEncoder'.
+    ^ CharacterEncoder guessEncodingOfStream:aStream
+! !
+
+!SourceCodeManagerUtilities methodsFor:'utilities-scm'!
 
 askForPackageVersion:question with:includeSubProjectsHolderOrNil knownTags:knownTags into:aTwoArgBlock
     |dateFormat string dateOrNil symbolicNameOrNil|
@@ -4186,7 +4223,7 @@
     "Created: / 29-12-2011 / 14:32:38 / cg"
 ! !
 
-!SourceCodeManagerUtilities methodsFor:'utilities-cvs-helpers'!
+!SourceCodeManagerUtilities methodsFor:'utilities-scm-helpers'!
 
 getMethodVersionsOfClass:aClass selector:selector numberOfRevisions:numberOfRevisionsOrNil
     "check-out all previous versions of aClass and retrieve the history of selector.
@@ -4262,7 +4299,7 @@
     "
 ! !
 
-!SourceCodeManagerUtilities methodsFor:'utilities-cvs-user interaction'!
+!SourceCodeManagerUtilities methodsFor:'utilities-scm-user interaction'!
 
 askForContainer:boxText title:title note:notice initialModule:initialModule initialPackage:initialPackage initialFileName:initialFileName
     "open a dialog asking for a source container;
@@ -4584,16 +4621,8 @@
         revisions := items := nil.
 
         newestRev isNil ifTrue:[
-            (aSourceCodeManager checkForExistingContainer:fileName inModule:module directory:directory)
+            (aSourceCodeManager checkForExistingContainer:fileName inModule:module directory:directory warn:true)
             ifFalse:[
-                self warn:'Could not find/access the container for ',fileName,' in the repository.
-This could be due to:
-    - invalid/wrong CVS-Root setting
-    - missing CVS access rights
-        (no access / not logged in)
-    - changed CVSRoot after compilation
-        (i.e. wrong CVS-path in classes version method)
-'.
                 ^ nil
             ]
         ]
@@ -4709,7 +4738,7 @@
         fileName:'Array.st'
     "
 
-    "Modified: / 30-04-2016 / 14:32:17 / cg"
+    "Modified: / 24-02-2017 / 11:38:39 / cg"
 !
 
 checkAndWarnAboutBadMessagesInClass:aClass checkAgainHolder:checkAgainHolder
@@ -5129,43 +5158,6 @@
     ^ nil
 ! !
 
-!SourceCodeManagerUtilities methodsFor:'utilities-encoding'!
-
-guessEncodingOfFile:aFilename
-    "look for a string
-        encoding #name
-     or:
-        encoding: name
-     within the given buffer 
-     (which is usually the first few bytes of a textFile).
-     If that's not found, use heuristics (in CharacterArray) to guess."
-
-    <resource: #obsolete>
-
-    self obsoleteMethodWarning:'ask CharacterEncoder'.
-    ^ CharacterEncoder guessEncodingOfFile:aFilename
-
-    "
-     SourceCodeManagerUtilities guessEncodingOfFile:'../../libview2/resources/ApplicationModel_de.rs' asFilename
-     SourceCodeManagerUtilities guessEncodingOfFile:'../../libview2/resources/ApplicationModel_ru.rs' asFilename
-    "
-
-    "Modified (comment): / 14-01-2012 / 20:54:35 / cg"
-!
-
-guessEncodingOfStream:aStream
-    "look for a string of the form
-            encoding #name
-     or:
-            encoding: name
-     in the first few bytes of aStream."
-
-    <resource: #obsolete>
-
-    self obsoleteMethodWarning:'ask CharacterEncoder'.
-    ^ CharacterEncoder guessEncodingOfStream:aStream
-! !
-
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version