changed: #diffSetOfProject:againstRepositoryVersionFrom:
authorClaus Gittinger <cg@exept.de>
Sat, 07 Aug 2010 10:33:59 +0200
changeset 2286 ad425b1c40ab
parent 2285 3128849e7d2e
child 2287 271a86b96fd3
changed: #diffSetOfProject:againstRepositoryVersionFrom:
SourceCodeManagerUtilities.st
--- a/SourceCodeManagerUtilities.st	Mon Aug 02 13:35:24 2010 +0200
+++ b/SourceCodeManagerUtilities.st	Sat Aug 07 10:33:59 2010 +0200
@@ -12,11 +12,11 @@
 "{ Package: 'stx:libbasic3' }"
 
 Object subclass:#SourceCodeManagerUtilities
-        instanceVariableNames:''
-        classVariableNames:'LastSourceLogMessage LastModule LastPackage YesToAllQuery
-                YesToAllNotification'
-        poolDictionaries:''
-        category:'System-SourceCodeManagement'
+	instanceVariableNames:''
+	classVariableNames:'LastSourceLogMessage LastModule LastPackage YesToAllQuery
+		YesToAllNotification'
+	poolDictionaries:''
+	category:'System-SourceCodeManagement'
 !
 
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
@@ -2147,7 +2147,7 @@
                 ChangeSet current condenseChangesForPackage:aProject.
             ].
         ].
-        ^ self.
+        ^ diffSet.
     ].
 
     "/ as a side-effect, if we find that some classes are modified but the same as in the repository,
@@ -2175,17 +2175,18 @@
                             removeButton isReturnButton:true.
                    ].
             box open.
-            box accepted ifFalse:[
-                ^ self
-            ].
-            doCleanup ifTrue:[
-                classesNotReallyModified do:[:class |
-                    ChangeSet current condenseChangesForClass:class.
-                ]
-            ].
+            box accepted ifTrue:[
+                doCleanup ifTrue:[
+                    classesNotReallyModified do:[:class |
+                        ChangeSet current condenseChangesForClass:class.
+                    ]
+                ].
+            ]
         ].
     ].
     ^ diffSet
+
+    "Modified: / 07-08-2010 / 10:31:21 / cg"
 !
 
 removeSourceContainerForClass:aClass
@@ -3192,9 +3193,9 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.203 2010-07-06 09:45:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.204 2010-08-07 08:33:59 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.203 2010-07-06 09:45:14 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.204 2010-08-07 08:33:59 cg Exp $'
 ! !