--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Tue Dec 05 20:32:48 2017 +0100
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Tue Dec 05 20:32:58 2017 +0100
@@ -39,6 +39,14 @@
 !SourceCodeManagerUtilitiesForContainerBasedManagers methodsFor:'utilities-cvs'!
 
 checkinBuildSupportFilesForPackage:packageID withInfo:checkinInfo
+    ^ self checkinBuildSupportFilesForPackage:packageID withInfo:checkinInfo onBranch:nil
+
+    "Created: / 09-08-2006 / 18:59:42 / fm"
+    "Modified: / 12-10-2011 / 11:36:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 05-12-2017 / 20:31:34 / cg"
+!
+
+checkinBuildSupportFilesForPackage:packageID withInfo:checkinInfo onBranch:branchNameOrNil
     |anyFailure module directory mgr defClass|
 
     mgr := self sourceCodeManagerFor: packageID. 
@@ -146,16 +154,22 @@
         self activityNotification:'Build-support files checked into the repository.'.
     ].
 
-    "Created: / 09-08-2006 / 18:59:42 / fm"
-    "Modified: / 12-10-2011 / 11:36:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 25-07-2012 / 14:27:30 / cg"
-    "Modified (format): / 25-07-2012 / 22:25:48 / cg"
+    "Created: / 05-12-2017 / 20:31:18 / cg"
 !
 
 checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil
     "checkin a projects extensions into the source repository.
      If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
 
+    ^ self checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil onBranch:nil
+
+    "Modified: / 05-12-2017 / 20:13:21 / cg"
+!
+
+checkinExtensionMethods:aCollectionOfMethods forPackage:aPackageID withInfo:aLogInfoOrStringOrNil onBranch:branchNameOrNil
+    "checkin a projects extensions into the source repository.
+     If the argument, aLogInfoOrStringOrNil isNil, ask interactively for log-message."
+
     |logMessage checkinInfo mgr pri module directory containerFileName extensionsSource|
 
     "/ the following is wrong - must ask the projectDefinition !!
@@ -240,10 +254,10 @@
         ].
     ^ true
 
-    "Modified: / 25-07-2012 / 18:38:40 / cg"
+    "Created: / 05-12-2017 / 20:12:50 / cg"
 !
 
-checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages
+checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages onBranch:branchNameOrNil
     |mgr classesToCheckIn methodsToCheckIn methodsInPrjDef
      methodsInOtherPackages looseMethods otherPackages
      msg classesInChangeSet newClasses checkinInfo originalCheckinInfo classesToTag
@@ -382,7 +396,8 @@
             (self
                 checkinExtensionMethods:methodsToCheckIn
                 forPackage:packageToCheckIn
-                withInfo:checkinInfo)
+                withInfo:checkinInfo
+                onBranch:branchNameOrNil)
             ifFalse:[
                 Dialog warn:(resources string:'Could not check in extensions for project %1' with:packageToCheckIn).
                 ^ self.
@@ -392,11 +407,11 @@
             (mgr
                 checkForExistingContainer:'extensions.st' inPackage:packageToCheckIn)
             ifTrue:[
-"/ self halt.
                 (self
                     checkinExtensionMethods:#()
                     forPackage:packageToCheckIn
-                    withInfo:'No extensions any more')
+                    withInfo:'No extensions any more'
+                    onBranch:branchNameOrNil)
                 ifFalse:[
                     Dialog warn:(resources string:'Could not check in extensions for project %1' with:packageToCheckIn).
                     ^ self.
@@ -460,10 +475,8 @@
         "/ not only the one's in the changeSet;
         "/ also those which have not been checked in before.
         newClasses := classesToCheckIn select:[:class | (class revisionOfManager:mgr) isNil ].
-        classesToCheckIn := Set new 
-                                addAll:classesInChangeSet; 
-                                addAll:newClasses; 
-                                yourself.
+        classesToCheckIn := Set new. 
+        classesToCheckIn addAll:classesInChangeSet; addAll:newClasses.
     ].
 
     "/ check if any of the classes contains methods for other packages ...
@@ -546,7 +559,7 @@
                     mthd package:packageToCheckIn
                 ].
             ].
-            self checkinClasses:classesToCheckIn withInfo:checkinInfo.
+            self checkinClasses:classesToCheckIn withInfo:checkinInfo onBranch:branchNameOrNil.
         ].
 
         originalCheckinInfo notNil ifTrue:[
@@ -564,11 +577,10 @@
     ].
 
     doBuild ifTrue:[
-        self checkinBuildSupportFilesForPackage:packageToCheckIn withInfo:(originalCheckinInfo ? checkinInfo).
+        self checkinBuildSupportFilesForPackage:packageToCheckIn withInfo:(originalCheckinInfo ? checkinInfo) onBranch:branchNameOrNil.
     ].
 
-    "Created: / 13-10-2011 / 11:15:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 04-12-2017 / 23:17:58 / cg"
+    "Created: / 05-12-2017 / 20:03:19 / cg"
 ! !
 
 !SourceCodeManagerUtilitiesForContainerBasedManagers class methodsFor:'documentation'!