# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1429782540 -3600
# Node ID 269c09751322033b71b56cadd01c304e49f0807b
# Parent  007d9f526748387f986857e068abb3788c63561a
Fixed "Compare" changeset creation to ease applying it

* Remove useless "Orgainization" change
* Move all class definitions to the begining so apply would first create / modify all missing
   classes and then create/modify methods.

diff -r 007d9f526748 -r 269c09751322 MCRepositoryBrowser.st
--- a/MCRepositoryBrowser.st	Wed Apr 15 11:26:14 2015 +0100
+++ b/MCRepositoryBrowser.st	Thu Apr 23 10:49:00 2015 +0100
@@ -594,10 +594,15 @@
             label: '-'
           )
          (MenuItem
-            label: 'Compare with Image'
+            label: 'Compare'
             itemValue: versionCompareWithImage
           )
          (MenuItem
+            enabled: false
+            label: 'Merge'
+            itemValue: versionMerge
+          )
+         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -605,6 +610,9 @@
             itemValue: saveMCZFileAs
           )
          (MenuItem
+            label: '-'
+          )
+         (MenuItem
             label: 'Show in File Browser'
             itemValue: showPackageInFileBrowser
           )
@@ -1237,6 +1245,13 @@
         diffCS addAll: (diffset onlyInReceiver).
         diffCS addAll: (diffset changed collect:[:pair | pair first ]).
         diffCS addAll: (diffset onlyInArg collect:[ :chg | chg asAntiChange ]).
+        "/ Filter out Organization change - not needed for Smalltalk/X
+        (diffCS first isOtherChange and:[ diffCS first source startsWith: '" Organization:' ]) ifTrue:[ 
+            diffCS removeFirst.
+        ].
+        "/ Sort so that class definitions are first...
+        diffCS sort:[ :a :b | a isClassDefinitionChange and:[b isClassDefinitionChange not] ].
+
         diffCS name: (resources string: 'Diffs between %1 (MC version) and %2 (in image)' with: version info name with: package).
         (Tools::ChangeSetBrowser2 on: diffCS)
             beOneColumn;
@@ -1247,8 +1262,7 @@
             open       
     ].
 
-    "Modified: / 15-04-2015 / 10:50:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 15-04-2015 / 10:13:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 23-04-2015 / 10:37:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 versionInspect