Bugfix: reading of Java class extensions methods. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 29 Jan 2013 14:40:26 +0000
branchjv
changeset 3121 19723298dd2c
parent 3101 f8e4d06048d2
child 3123 f2d7f70fdb0a
Bugfix: reading of Java class extensions methods.
AbstractSourceCodeManager.st
CVSSourceCodeManager.st
CVSVersionInfo.st
CallChain.st
Change.st
ChangeDeltaInformation.st
ChangeNotificationParameter.st
ChangeSet.st
ChangeSetDiff.st
ChangeSetDiffComponent.st
ChangeSetDiffEntry.st
ChangeSetDiffSet.st
ClassCategoryChange.st
ClassChange.st
ClassClassVariableChange.st
ClassCommentChange.st
ClassDefinitionChange.st
ClassInstVarDefinitionChange.st
ClassOrganizer.st
ClassOtherChange.st
ClassPrimitiveChange.st
ClassPrimitiveDefinitionsChange.st
ClassPrimitiveFunctionsChange.st
ClassPrimitiveVariablesChange.st
ClassRemoveChange.st
ClassRenameChange.st
CompositeChange.st
DataBaseSourceCodeManager.st
DoItChange.st
FileBasedSourceCodeManager.st
FileInChange.st
HTMLDocGenerator.st
HistoryManager.st
InfoChange.st
InvalidChange.st
Make.proto
Make.spec
Makefile
MessageTally.st
MessageTracer.st
MethodCategoryChange.st
MethodCategoryChangeNotificationParameter.st
MethodCategoryRenameChange.st
MethodChange.st
MethodChangeNotificationParameter.st
MethodDefinitionChange.st
MethodFinder.st
MethodPackageChange.st
MethodPrivacyChange.st
MethodRemoveChange.st
MethodRemoveChangeNotificationParameter.st
MethodTrapChangeNotificationParameter.st
NameSpaceCreationChange.st
OtherChange.st
PerforceSourceCodeManager.st
ProfileTree.st
ProjectChecker.st
ProjectProblem.st
SVNVersionInfo.st
SourceCodeCache.st
SourceCodeManagerError.st
SourceCodeManagerUtilities.st
SourceCodeManagerUtilitiesForContainerBasedManagers.st
SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st
StoreSourceCodeManager.st
SystemOrganizer.st
TimestampChange.st
TraceBuffer.st
VersionInfo.st
WrappedMethod.st
bc.mak
bmake.bat
extensions.st
libbasic3.rc
stx_libbasic3.st
vcmake.bat
--- a/AbstractSourceCodeManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/AbstractSourceCodeManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -3828,8 +3828,14 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/AbstractSourceCodeManager.st,v 1.305 2012/11/22 21:50:24 stefan Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: AbstractSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: AbstractSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
 
+
 AbstractSourceCodeManager initialize!
--- a/CVSSourceCodeManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/CVSSourceCodeManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -533,12 +533,6 @@
     ^ self shouldImplement
 ! !
 
-!CVSSourceCodeManager class methodsFor:'debugging'!
-
-
-
- !
-
 !CVSSourceCodeManager class methodsFor:'misc operations'!
 
 changeCVSRoot:newRootString inDirectoryTree:aDirectoryFilename
@@ -5196,8 +5190,14 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.444 2012/10/30 14:35:50 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: CVSSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: CVSSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
 
+
 CVSSourceCodeManager initialize!
--- a/CVSVersionInfo.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/CVSVersionInfo.st	Tue Jan 29 14:40:26 2013 +0000
@@ -186,13 +186,19 @@
 !CVSVersionInfo class methodsFor:'documentation'!
 
 version
-    ^ '$Id: CVSVersionInfo.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: CVSVersionInfo.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/CVSVersionInfo.st,v 1.10 2011/11/24 09:56:54 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: CVSVersionInfo.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: CVSVersionInfo.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/CallChain.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/CallChain.st	Tue Jan 29 14:40:26 2013 +0000
@@ -227,13 +227,19 @@
 !CallChain class methodsFor:'documentation'!
 
 version
-    ^ '$Id: CallChain.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: CallChain.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/CallChain.st,v 1.14 2010/07/04 08:06:27 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: CallChain.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: CallChain.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/Change.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/Change.st	Tue Jan 29 14:40:26 2013 +0000
@@ -334,6 +334,7 @@
 
 ! !
 
+
 !Change methodsFor:'queries'!
 
 isForGeneratedSubject
@@ -532,6 +533,12 @@
     ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.62 2012/10/30 14:25:24 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: Change.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: Change.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/ChangeDeltaInformation.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeDeltaInformation.st	Tue Jan 29 14:40:26 2013 +0000
@@ -150,15 +150,21 @@
 !ChangeDeltaInformation class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ChangeDeltaInformation.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ChangeDeltaInformation.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/ChangeDeltaInformation.st,v 1.1 2011/08/31 09:45:27 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ChangeDeltaInformation.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ChangeDeltaInformation.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
 
+
 ChangeDeltaInformation initialize!
--- a/ChangeNotificationParameter.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeNotificationParameter.st	Tue Jan 29 14:40:26 2013 +0000
@@ -52,6 +52,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/ChangeNotificationParameter.st,v 1.1 2010/04/19 13:26:40 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ChangeSet.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeSet.st	Tue Jan 29 14:40:26 2013 +0000
@@ -21,7 +21,7 @@
 Object subclass:#ChangeFileReader
 	instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver
 		arguments receiverSelector receiverReceiver lineNumber position
-		className methodSelector chunk timestamp'
+		className classIsJava methodSelector chunk timestamp'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:ChangeSet
@@ -34,6 +34,8 @@
 	privateIn:ChangeSet
 !
 
+NameSpace name:#'ChangeSet::ChangeSet'!
+
 SmalltalkChunkFileSourceWriter subclass:#ClassSourceWriter
 	instanceVariableNames:'changeSetBeingSaved namespaceName topClassName classInfos
 		metaInfos'
@@ -657,6 +659,7 @@
     "Created: / 27.10.1997 / 13:52:54 / cg"
 ! !
 
+
 !ChangeSet class methodsFor:'Compatibility-VW'!
 
 component: component definition: anObject change: changeSymbol
@@ -1213,6 +1216,7 @@
     "Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !ChangeSet methodsFor:'misc'!
 
 addPatch:nameOfPatch
@@ -1221,6 +1225,7 @@
     ^ self
 ! !
 
+
 !ChangeSet methodsFor:'private-accessing'!
 
 addChange:aChange
@@ -2212,18 +2217,39 @@
 
 classNameOf:aReceiver
 
-    | nameSpace clsName |
+    | nameSpace isMeta clsNode clsName |
     nameSpace := Class nameSpaceQuerySignal query.
 
-    (aReceiver isUnaryMessage and:[aReceiver selector == #class]) 
-            ifTrue:[clsName := (aReceiver receiver name) , ' class'] 
-            ifFalse:[clsName := aReceiver name].
+    isMeta := false.
+    classIsJava := false.
+
+    (aReceiver isUnaryMessage and:[aReceiver selector == #class]) ifTrue:[
+        isMeta := true.
+        clsNode := aReceiver receiver.
+    ] ifFalse:[
+        clsNode := aReceiver.
+    ].
+
+    clsNode isMessage ifFalse:[
+        "Normal smalltalk method on Smalltalk class"
+        clsName := clsNode name
+    ] ifTrue:[
+        "Maybe a Java class?"
+        ((clsNode selector == #classForName:) and:[clsNode receiver name = 'Java']) ifTrue:[
+            clsName := clsNode arguments first value.
+            classIsJava := true.
+        ].
+    ].
+
+    isMeta ifTrue:[
+        clsName := clsName , ' class'.
+    ].
 
     ^(nameSpace ~~ Smalltalk and:[(clsName startsWith: nameSpace name) not])
         ifTrue:[nameSpace name , '::' , clsName]
         ifFalse:[clsName].
 
-    "Modified: / 24-01-2012 / 17:07:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-01-2013 / 13:56:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extractMethodsClassAndSelectorFromReceiver
@@ -2499,6 +2525,7 @@
     ] ifFalse:[
         priv := nil
     ].
+    classIsJava := false.
     className := self receiversClassName.
 "/        nameSpace ~~ Smalltalk ifTrue:[
 "/            className := nameSpace name , '::' , className
@@ -2543,6 +2570,7 @@
             source:methodSource
             category:categoryName
             privacy:priv.
+        change classIsJava: classIsJava.
 
         self addChange:change.
 
@@ -2554,6 +2582,7 @@
     ^ true
 
     "Created: / 24-01-2012 / 16:52:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 29-01-2013 / 14:13:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 handleMethodPackageChange
@@ -3594,7 +3623,7 @@
 !
 
 version_SVN
-    ^ '$Id:: ChangeSet.st 1981 2012-11-30 17:20:01Z vranyj1                                                                         $'
+    ^ '§Id:: ChangeSet.st 1981 2012-11-30 17:20:01Z vranyj1                                                                         §'
 ! !
 
 !ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
@@ -4274,6 +4303,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.210 2012/11/06 01:41:21 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ChangeSet.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: ChangeSet.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/ChangeSetDiff.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeSetDiff.st	Tue Jan 29 14:40:26 2013 +0000
@@ -214,9 +214,15 @@
 !ChangeSetDiff class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ChangeSetDiff.st 1987 2013-01-17 17:13:41Z vranyj1 $'
+    ^ '$Header: ChangeSetDiff.st 1987 2013-01-17 17:13:41Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ChangeSetDiff.st 1987 2013-01-17 17:13:41Z vranyj1 $'
+    ^ '§Id: ChangeSetDiff.st 1987 2013-01-17 17:13:41Z vranyj1 §'
 ! !
+
--- a/ChangeSetDiffComponent.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeSetDiffComponent.st	Tue Jan 29 14:40:26 2013 +0000
@@ -286,9 +286,15 @@
 !ChangeSetDiffComponent class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ChangeSetDiffComponent.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+    ^ '$Header: ChangeSetDiffComponent.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ChangeSetDiffComponent.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+    ^ '§Id: ChangeSetDiffComponent.st 1986 2013-01-17 17:02:15Z vranyj1 §'
 ! !
+
--- a/ChangeSetDiffEntry.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeSetDiffEntry.st	Tue Jan 29 14:40:26 2013 +0000
@@ -415,9 +415,15 @@
 !ChangeSetDiffEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+    ^ '$Header: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+    ^ '§Id: ChangeSetDiffEntry.st 1986 2013-01-17 17:02:15Z vranyj1 §'
 ! !
+
--- a/ChangeSetDiffSet.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ChangeSetDiffSet.st	Tue Jan 29 14:40:26 2013 +0000
@@ -337,9 +337,15 @@
 !ChangeSetDiffSet class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ChangeSetDiffSet.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+    ^ '$Header: ChangeSetDiffSet.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ChangeSetDiffSet.st 1986 2013-01-17 17:02:15Z vranyj1 $'
+    ^ '§Id: ChangeSetDiffSet.st 1986 2013-01-17 17:02:15Z vranyj1 §'
 ! !
+
--- a/ClassCategoryChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassCategoryChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -112,9 +112,15 @@
 !ClassCategoryChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassCategoryChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassCategoryChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassCategoryChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassCategoryChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -438,6 +438,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/ClassChange.st,v 1.66 2012/08/10 10:09:45 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ClassChange.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+    ^ '§Id: ClassChange.st 1957 2012-09-05 11:45:38Z vranyj1 §'
 ! !
+
--- a/ClassClassVariableChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassClassVariableChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -75,9 +75,15 @@
 !ClassClassVariableChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassClassVariableChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassClassVariableChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassClassVariableChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassClassVariableChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassCommentChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassCommentChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -151,9 +151,15 @@
 !ClassCommentChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassCommentChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassCommentChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassCommentChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassCommentChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassDefinitionChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassDefinitionChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -761,9 +761,15 @@
 !ClassDefinitionChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassDefinitionChange.st 1961 2012-09-07 17:29:20Z vranyj1 $'
+    ^ '$Header: ClassDefinitionChange.st 1961 2012-09-07 17:29:20Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id:: ClassDefinitionChange.st 1961 2012-09-07 17:29:20Z vranyj1                                                             $'
+    ^ '§Id:: ClassDefinitionChange.st 1961 2012-09-07 17:29:20Z vranyj1                                                             §'
 ! !
+
--- a/ClassInstVarDefinitionChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassInstVarDefinitionChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -94,9 +94,15 @@
 !ClassInstVarDefinitionChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassInstVarDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassInstVarDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassInstVarDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassInstVarDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassOrganizer.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassOrganizer.st	Tue Jan 29 14:40:26 2013 +0000
@@ -333,9 +333,15 @@
 !ClassOrganizer class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassOtherChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassOtherChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -76,9 +76,15 @@
 !ClassOtherChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassOtherChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassOtherChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassOtherChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassOtherChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassPrimitiveChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassPrimitiveChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -98,13 +98,19 @@
 !ClassPrimitiveChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassPrimitiveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassPrimitiveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/ClassPrimitiveChange.st,v 1.7 2011/06/28 21:00:07 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ClassPrimitiveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassPrimitiveChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassPrimitiveDefinitionsChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassPrimitiveDefinitionsChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -87,13 +87,19 @@
 !ClassPrimitiveDefinitionsChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassPrimitiveDefinitionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassPrimitiveDefinitionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/ClassPrimitiveDefinitionsChange.st,v 1.11 2011/06/28 21:00:12 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ClassPrimitiveDefinitionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassPrimitiveDefinitionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassPrimitiveFunctionsChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassPrimitiveFunctionsChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -87,13 +87,19 @@
 !ClassPrimitiveFunctionsChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassPrimitiveFunctionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassPrimitiveFunctionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/ClassPrimitiveFunctionsChange.st,v 1.11 2011/06/28 21:00:09 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ClassPrimitiveFunctionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassPrimitiveFunctionsChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassPrimitiveVariablesChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassPrimitiveVariablesChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -87,13 +87,19 @@
 !ClassPrimitiveVariablesChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassPrimitiveVariablesChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassPrimitiveVariablesChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/ClassPrimitiveVariablesChange.st,v 1.11 2011/06/28 21:00:10 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ClassPrimitiveVariablesChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassPrimitiveVariablesChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassRemoveChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassRemoveChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -71,9 +71,15 @@
 !ClassRemoveChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassRemoveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ClassRemoveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassRemoveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ClassRemoveChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ClassRenameChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ClassRenameChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -106,9 +106,15 @@
 !ClassRenameChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ClassRenameChange.st 1948 2012-07-31 18:04:54Z vranyj1 $'
+    ^ '$Header: ClassRenameChange.st 1948 2012-07-31 18:04:54Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ClassRenameChange.st 1948 2012-07-31 18:04:54Z vranyj1 $'
+    ^ '§Id: ClassRenameChange.st 1948 2012-07-31 18:04:54Z vranyj1 §'
 ! !
+
--- a/CompositeChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/CompositeChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -120,6 +120,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/CompositeChange.st,v 1.4 2011/06/28 20:35:48 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: CompositeChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
-! !
\ No newline at end of file
+    ^ '§Id: CompositeChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
+! !
+
--- a/DataBaseSourceCodeManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/DataBaseSourceCodeManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -556,6 +556,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/DataBaseSourceCodeManager.st,v 1.10 2012/07/24 07:44:39 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: DataBaseSourceCodeManager.st 1937 2012-07-25 08:46:08Z vranyj1 $'
+    ^ '§Id: DataBaseSourceCodeManager.st 1937 2012-07-25 08:46:08Z vranyj1 §'
 ! !
+
--- a/DoItChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/DoItChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -103,9 +103,15 @@
 !DoItChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: DoItChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: DoItChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: DoItChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: DoItChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/FileBasedSourceCodeManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/FileBasedSourceCodeManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -475,6 +475,12 @@
     ^ '§Path: stx/libbasic3/FileBasedSourceCodeManager.st, Version: 13, User: cg, Time: 2011-12-22T00:40:40.985§'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: FileBasedSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: FileBasedSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/FileInChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/FileInChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -71,6 +71,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/FileInChange.st,v 1.1 2011/06/28 21:15:15 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: FileInChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: FileInChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/HTMLDocGenerator.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/HTMLDocGenerator.st	Tue Jan 29 14:40:26 2013 +0000
@@ -2700,6 +2700,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/HTMLDocGenerator.st,v 1.95 2012/07/27 09:09:29 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: HTMLDocGenerator.st 1945 2012-07-31 11:53:41Z vranyj1 $'
+    ^ '§Id: HTMLDocGenerator.st 1945 2012-07-31 11:53:41Z vranyj1 §'
 ! !
+
--- a/HistoryManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/HistoryManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -1022,7 +1022,7 @@
 !
 
 version
-    ^ '$Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
+    ^ '$Header: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
 ! !
 
 !HistoryManager::HistoryLine class methodsFor:'filtering'!
@@ -1718,12 +1718,18 @@
 !HistoryManager class methodsFor:'documentation'!
 
 version
-    ^ '$Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
+    ^ '$Header: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
+    ^ '§Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 §'
 ! !
 
+
 HistoryManager initialize!
 HistoryManager::HistoryLine initialize!
--- a/InfoChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/InfoChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -105,13 +105,19 @@
 !InfoChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: InfoChange.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+    ^ '$Header: InfoChange.st 1946 2012-07-31 14:00:47Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/InfoChange.st,v 1.1 2012-07-31 13:28:44 +0100 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id:: InfoChange.st 1946 2012-07-31 14:00:47Z vranyj1                                                                        $'
+    ^ '§Id:: InfoChange.st 1946 2012-07-31 14:00:47Z vranyj1                                                                        §'
 ! !
+
--- a/InvalidChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/InvalidChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -55,13 +55,19 @@
 !InvalidChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: InvalidChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: InvalidChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/InvalidChange.st,v 1.1 2012/01/24 17:36:37 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: InvalidChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: InvalidChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/Make.proto	Mon Jan 21 09:21:30 2013 +0000
+++ b/Make.proto	Tue Jan 29 14:40:26 2013 +0000
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libdb/libsqlite -I$(INCLUDE_TOP)/stx/libdb/libodbc
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libdb/libodbc -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libdb/libsqlite -I$(INCLUDE_TOP)/stx/libbasic2
 
 
 # if you need any additional defines for embedded C code,
@@ -92,6 +92,13 @@
 
 
 
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_libbasic3.$(O): $(shell hg root)/.hg/dirstate
+endif
+
 
 
 
@@ -115,13 +122,12 @@
 postMake:: cleanjunk
 
 prereq: $(REQUIRED_SUPPORT_DIRS)
+	cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 	cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
 
 
 
@@ -141,7 +147,7 @@
 $(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -177,7 +183,7 @@
 $(OUTDIR)MethodChangeNotificationParameter.$(O) MethodChangeNotificationParameter.$(H): MethodChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic3/ChangeNotificationParameter.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)NameSpaceCreationChange.$(O) NameSpaceCreationChange.$(H): NameSpaceCreationChange.st $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)OtherChange.$(O) OtherChange.$(H): OtherChange.st $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(STCHDR)
+$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
 $(OUTDIR)SVNVersionInfo.$(O) SVNVersionInfo.$(H): SVNVersionInfo.st $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) SourceCodeManagerUtilitiesForContainerBasedManagers.$(H): SourceCodeManagerUtilitiesForContainerBasedManagers.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H): SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec	Mon Jan 21 09:21:30 2013 +0000
+++ b/Make.spec	Tue Jan 29 14:40:26 2013 +0000
@@ -125,77 +125,77 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR)AbstractSourceCodeManager.$(O) \
-    $(OUTDIR)CallChain.$(O) \
-    $(OUTDIR)Change.$(O) \
-    $(OUTDIR)ChangeSet.$(O) \
-    $(OUTDIR)ClassOrganizer.$(O) \
-    $(OUTDIR)HTMLDocGenerator.$(O) \
-    $(OUTDIR)HistoryManager.$(O) \
-    $(OUTDIR)MessageTally.$(O) \
-    $(OUTDIR)MessageTracer.$(O) \
-    $(OUTDIR)MethodFinder.$(O) \
-    $(OUTDIR)ProfileTree.$(O) \
-    $(OUTDIR)SourceCodeManagerError.$(O) \
-    $(OUTDIR)SourceCodeManagerUtilities.$(O) \
-    $(OUTDIR)SystemOrganizer.$(O) \
-    $(OUTDIR)VersionInfo.$(O) \
-    $(OUTDIR)WrappedMethod.$(O) \
-    $(OUTDIR)stx_libbasic3.$(O) \
-    $(OUTDIR)CVSSourceCodeManager.$(O) \
-    $(OUTDIR)CVSVersionInfo.$(O) \
-    $(OUTDIR)ClassChange.$(O) \
-    $(OUTDIR)CompositeChange.$(O) \
-    $(OUTDIR)DoItChange.$(O) \
-    $(OUTDIR)FileInChange.$(O) \
-    $(OUTDIR)NameSpaceCreationChange.$(O) \
-    $(OUTDIR)OtherChange.$(O) \
-    $(OUTDIR)StoreSourceCodeManager.$(O) \
-    $(OUTDIR)ClassCategoryChange.$(O) \
-    $(OUTDIR)ClassClassVariableChange.$(O) \
-    $(OUTDIR)ClassCommentChange.$(O) \
-    $(OUTDIR)ClassDefinitionChange.$(O) \
-    $(OUTDIR)ClassInstVarDefinitionChange.$(O) \
-    $(OUTDIR)ClassOtherChange.$(O) \
-    $(OUTDIR)ClassPrimitiveChange.$(O) \
-    $(OUTDIR)ClassRemoveChange.$(O) \
-    $(OUTDIR)ClassRenameChange.$(O) \
-    $(OUTDIR)MethodCategoryRenameChange.$(O) \
-    $(OUTDIR)MethodChange.$(O) \
-    $(OUTDIR)TimestampChange.$(O) \
-    $(OUTDIR)ClassPrimitiveDefinitionsChange.$(O) \
-    $(OUTDIR)ClassPrimitiveFunctionsChange.$(O) \
-    $(OUTDIR)ClassPrimitiveVariablesChange.$(O) \
-    $(OUTDIR)MethodCategoryChange.$(O) \
-    $(OUTDIR)MethodDefinitionChange.$(O) \
-    $(OUTDIR)MethodPackageChange.$(O) \
-    $(OUTDIR)MethodPrivacyChange.$(O) \
-    $(OUTDIR)MethodRemoveChange.$(O) \
-    $(OUTDIR)ChangeNotificationParameter.$(O) \
-    $(OUTDIR)MethodChangeNotificationParameter.$(O) \
-    $(OUTDIR)MethodRemoveChangeNotificationParameter.$(O) \
-    $(OUTDIR)MethodCategoryChangeNotificationParameter.$(O) \
-    $(OUTDIR)MethodTrapChangeNotificationParameter.$(O) \
-    $(OUTDIR)TraceBuffer.$(O) \
-    $(OUTDIR)PerforceSourceCodeManager.$(O) \
-    $(OUTDIR)ChangeSetDiffComponent.$(O) \
-    $(OUTDIR)ChangeSetDiff.$(O) \
-    $(OUTDIR)ChangeSetDiffSet.$(O) \
-    $(OUTDIR)ChangeSetDiffEntry.$(O) \
-    $(OUTDIR)ChangeDeltaInformation.$(O) \
-    $(OUTDIR)SVNVersionInfo.$(O) \
-    $(OUTDIR)SourceCodeCache.$(O) \
-    $(OUTDIR)FileBasedSourceCodeManager.$(O) \
-    $(OUTDIR)DataBaseSourceCodeManager.$(O) \
-    $(OUTDIR)ProjectChecker.$(O) \
-    $(OUTDIR)MercurialSourceCodeManager.$(O) \
-    $(OUTDIR)InvalidChange.$(O) \
-    $(OUTDIR)InfoChange.$(O) \
-    $(OUTDIR)GitSourceCodeManager.$(O) \
-    $(OUTDIR)ProjectProblem.$(O) \
-    $(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) \
-    $(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) \
-    $(OUTDIR)extensions.$(O) \
+    $(OUTDIR_SLASH)AbstractSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)CallChain.$(O) \
+    $(OUTDIR_SLASH)Change.$(O) \
+    $(OUTDIR_SLASH)ChangeSet.$(O) \
+    $(OUTDIR_SLASH)ClassOrganizer.$(O) \
+    $(OUTDIR_SLASH)HTMLDocGenerator.$(O) \
+    $(OUTDIR_SLASH)HistoryManager.$(O) \
+    $(OUTDIR_SLASH)MessageTally.$(O) \
+    $(OUTDIR_SLASH)MessageTracer.$(O) \
+    $(OUTDIR_SLASH)MethodFinder.$(O) \
+    $(OUTDIR_SLASH)ProfileTree.$(O) \
+    $(OUTDIR_SLASH)SourceCodeManagerError.$(O) \
+    $(OUTDIR_SLASH)SourceCodeManagerUtilities.$(O) \
+    $(OUTDIR_SLASH)SystemOrganizer.$(O) \
+    $(OUTDIR_SLASH)VersionInfo.$(O) \
+    $(OUTDIR_SLASH)WrappedMethod.$(O) \
+    $(OUTDIR_SLASH)stx_libbasic3.$(O) \
+    $(OUTDIR_SLASH)CVSSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)CVSVersionInfo.$(O) \
+    $(OUTDIR_SLASH)ClassChange.$(O) \
+    $(OUTDIR_SLASH)CompositeChange.$(O) \
+    $(OUTDIR_SLASH)DoItChange.$(O) \
+    $(OUTDIR_SLASH)FileInChange.$(O) \
+    $(OUTDIR_SLASH)NameSpaceCreationChange.$(O) \
+    $(OUTDIR_SLASH)OtherChange.$(O) \
+    $(OUTDIR_SLASH)StoreSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)ClassCategoryChange.$(O) \
+    $(OUTDIR_SLASH)ClassClassVariableChange.$(O) \
+    $(OUTDIR_SLASH)ClassCommentChange.$(O) \
+    $(OUTDIR_SLASH)ClassDefinitionChange.$(O) \
+    $(OUTDIR_SLASH)ClassInstVarDefinitionChange.$(O) \
+    $(OUTDIR_SLASH)ClassOtherChange.$(O) \
+    $(OUTDIR_SLASH)ClassPrimitiveChange.$(O) \
+    $(OUTDIR_SLASH)ClassRemoveChange.$(O) \
+    $(OUTDIR_SLASH)ClassRenameChange.$(O) \
+    $(OUTDIR_SLASH)MethodCategoryRenameChange.$(O) \
+    $(OUTDIR_SLASH)MethodChange.$(O) \
+    $(OUTDIR_SLASH)TimestampChange.$(O) \
+    $(OUTDIR_SLASH)ClassPrimitiveDefinitionsChange.$(O) \
+    $(OUTDIR_SLASH)ClassPrimitiveFunctionsChange.$(O) \
+    $(OUTDIR_SLASH)ClassPrimitiveVariablesChange.$(O) \
+    $(OUTDIR_SLASH)MethodCategoryChange.$(O) \
+    $(OUTDIR_SLASH)MethodDefinitionChange.$(O) \
+    $(OUTDIR_SLASH)MethodPackageChange.$(O) \
+    $(OUTDIR_SLASH)MethodPrivacyChange.$(O) \
+    $(OUTDIR_SLASH)MethodRemoveChange.$(O) \
+    $(OUTDIR_SLASH)ChangeNotificationParameter.$(O) \
+    $(OUTDIR_SLASH)MethodChangeNotificationParameter.$(O) \
+    $(OUTDIR_SLASH)MethodRemoveChangeNotificationParameter.$(O) \
+    $(OUTDIR_SLASH)MethodCategoryChangeNotificationParameter.$(O) \
+    $(OUTDIR_SLASH)MethodTrapChangeNotificationParameter.$(O) \
+    $(OUTDIR_SLASH)TraceBuffer.$(O) \
+    $(OUTDIR_SLASH)PerforceSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)ChangeSetDiffComponent.$(O) \
+    $(OUTDIR_SLASH)ChangeSetDiff.$(O) \
+    $(OUTDIR_SLASH)ChangeSetDiffSet.$(O) \
+    $(OUTDIR_SLASH)ChangeSetDiffEntry.$(O) \
+    $(OUTDIR_SLASH)ChangeDeltaInformation.$(O) \
+    $(OUTDIR_SLASH)SVNVersionInfo.$(O) \
+    $(OUTDIR_SLASH)SourceCodeCache.$(O) \
+    $(OUTDIR_SLASH)FileBasedSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)DataBaseSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)ProjectChecker.$(O) \
+    $(OUTDIR_SLASH)MercurialSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)InvalidChange.$(O) \
+    $(OUTDIR_SLASH)InfoChange.$(O) \
+    $(OUTDIR_SLASH)GitSourceCodeManager.$(O) \
+    $(OUTDIR_SLASH)ProjectProblem.$(O) \
+    $(OUTDIR_SLASH)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) \
+    $(OUTDIR_SLASH)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) \
+    $(OUTDIR_SLASH)extensions.$(O) \
 
 
 
--- a/Makefile	Mon Jan 21 09:21:30 2013 +0000
+++ b/Makefile	Tue Jan 29 14:40:26 2013 +0000
@@ -15,5 +15,7 @@
 #only needed for the definition of $(TOP)
 include Make.proto
 
-makefile:
+makefile: mf
+
+mf:
 	$(TOP)/rules/stmkmf
--- a/MessageTally.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MessageTally.st	Tue Jan 29 14:40:26 2013 +0000
@@ -645,6 +645,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MessageTally.st,v 1.48 2012/11/04 21:09:17 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MessageTally.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: MessageTally.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/MessageTracer.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MessageTracer.st	Tue Jan 29 14:40:26 2013 +0000
@@ -3272,8 +3272,14 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MessageTracer.st,v 1.117 2012/11/05 23:09:21 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MessageTracer.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: MessageTracer.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
 
+
 MessageTracer initialize!
--- a/MethodCategoryChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodCategoryChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -151,6 +151,12 @@
     ^ '$Header: /cvs/stx/stx/libbasic3/MethodCategoryChange.st,v 1.22 2012/07/31 12:27:40 vrany Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodCategoryChange.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+    ^ '§Id: MethodCategoryChange.st 1957 2012-09-05 11:45:38Z vranyj1 §'
 ! !
+
--- a/MethodCategoryChangeNotificationParameter.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodCategoryChangeNotificationParameter.st	Tue Jan 29 14:40:26 2013 +0000
@@ -59,6 +59,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodCategoryChangeNotificationParameter.st,v 1.1 2010/04/19 13:27:28 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodCategoryChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodCategoryChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodCategoryRenameChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodCategoryRenameChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -74,9 +74,15 @@
 !MethodCategoryRenameChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: MethodCategoryRenameChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: MethodCategoryRenameChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: MethodCategoryRenameChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodCategoryRenameChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -12,7 +12,7 @@
 "{ Package: 'stx:libbasic3' }"
 
 ClassChange subclass:#MethodChange
-	instanceVariableNames:'selector methodCategory privacy previousVersion'
+	instanceVariableNames:'selector methodCategory privacy previousVersion classIsJava'
 	classVariableNames:'LastReplacementClass'
 	poolDictionaries:''
 	category:'System-Changes'
@@ -105,6 +105,34 @@
     self className:(cls name) selector:sel source:src category:cat
 !
 
+classIsJava
+    "Returns true, if this change is for Java class (i.e., if it is for
+     Smalltalk method that extends Java class)"
+
+    ^ classIsJava
+
+    "Modified (comment): / 29-01-2013 / 14:11:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+classIsJava:aBoolean
+    "Sets whether this change is for Java class (i.e., if it is for
+     Smalltalk method that extends Java class)"
+
+    classIsJava := aBoolean.
+
+    "Modified (comment): / 29-01-2013 / 14:11:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+className
+    ^classIsJava ifTrue:[
+        className
+    ] ifFalse:[
+        super className
+    ]
+
+    "Created: / 29-01-2013 / 14:21:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 className:clsName selector:sel source:src category:cat
     self className:clsName selector:sel source:src category:cat privacy:nil
 !
@@ -398,6 +426,7 @@
     "Created: / 09-10-2006 / 13:58:09 / cg"
 ! !
 
+
 !MethodChange methodsFor:'testing'!
 
 isMethodChange
@@ -474,6 +503,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodChange.st,v 1.68 2012/10/30 14:25:11 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodChange.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: MethodChange.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/MethodChangeNotificationParameter.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodChangeNotificationParameter.st	Tue Jan 29 14:40:26 2013 +0000
@@ -57,6 +57,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodChangeNotificationParameter.st,v 1.1 2010/04/19 13:26:59 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodDefinitionChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodDefinitionChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -57,9 +57,15 @@
 !MethodDefinitionChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: MethodDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: MethodDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: MethodDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodDefinitionChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodFinder.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodFinder.st	Tue Jan 29 14:40:26 2013 +0000
@@ -1637,6 +1637,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodFinder.st,v 1.31 2012/10/29 11:38:51 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodFinder.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: MethodFinder.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/MethodPackageChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodPackageChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -113,13 +113,19 @@
 !MethodPackageChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: MethodPackageChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: MethodPackageChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodPackageChange.st,v 1.4 2010/04/14 13:40:49 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodPackageChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodPackageChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodPrivacyChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodPrivacyChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -93,13 +93,19 @@
 !MethodPrivacyChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: MethodPrivacyChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: MethodPrivacyChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodPrivacyChange.st,v 1.11 2010/04/14 13:40:33 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodPrivacyChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodPrivacyChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodRemoveChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodRemoveChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -143,6 +143,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodRemoveChange.st,v 1.15 2011/08/31 10:05:55 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodRemoveChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodRemoveChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodRemoveChangeNotificationParameter.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodRemoveChangeNotificationParameter.st	Tue Jan 29 14:40:26 2013 +0000
@@ -51,6 +51,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodRemoveChangeNotificationParameter.st,v 1.1 2010/04/19 13:27:15 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodRemoveChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodRemoveChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/MethodTrapChangeNotificationParameter.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/MethodTrapChangeNotificationParameter.st	Tue Jan 29 14:40:26 2013 +0000
@@ -51,6 +51,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/MethodTrapChangeNotificationParameter.st,v 1.1 2010/04/19 13:27:41 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: MethodTrapChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: MethodTrapChangeNotificationParameter.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/NameSpaceCreationChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/NameSpaceCreationChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -90,9 +90,15 @@
 !NameSpaceCreationChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: NameSpaceCreationChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: NameSpaceCreationChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: NameSpaceCreationChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: NameSpaceCreationChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/OtherChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/OtherChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -104,6 +104,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/OtherChange.st,v 1.5 2012-07-31 13:23:08 +0100 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: OtherChange.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+    ^ '§Id: OtherChange.st 1957 2012-09-05 11:45:38Z vranyj1 §'
 ! !
+
--- a/PerforceSourceCodeManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/PerforceSourceCodeManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -9,7 +9,7 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-"{ Package: '__NoProject__' }"
+"{ Package: 'stx:libbasic3' }"
 
 AbstractSourceCodeManager subclass:#PerforceSourceCodeManager
 	instanceVariableNames:''
@@ -741,8 +741,6 @@
     "Modified: / 25-10-2006 / 17:41:46 / cg"
 !
 
-
-
 createContainerFor:cls inModule:moduleName package:packageDir container:classFileName logMessage:logMessage
 
     ^ self checkinClass:cls fileName:classFileName directory:packageDir module:moduleName logMessage:logMessage force:false.
@@ -1977,6 +1975,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/PerforceSourceCodeManager.st,v 1.29 2012/11/02 10:25:27 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: PerforceSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 $'
+    ^ '§Id: PerforceSourceCodeManager.st 1981 2012-11-30 17:20:01Z vranyj1 §'
 ! !
+
--- a/ProfileTree.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ProfileTree.st	Tue Jan 29 14:40:26 2013 +0000
@@ -501,9 +501,15 @@
 !ProfileTree class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ProfileTree.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: ProfileTree.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ProfileTree.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: ProfileTree.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/ProjectChecker.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ProjectChecker.st	Tue Jan 29 14:40:26 2013 +0000
@@ -574,9 +574,15 @@
 !ProjectChecker class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ProjectChecker.st 1982 2012-12-06 15:48:40Z vranyj1 $'
+    ^ '$Header: ProjectChecker.st 1982 2012-12-06 15:48:40Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: ProjectChecker.st 1982 2012-12-06 15:48:40Z vranyj1 $'
+    ^ '§Id: ProjectChecker.st 1982 2012-12-06 15:48:40Z vranyj1 §'
 ! !
+
--- a/ProjectProblem.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/ProjectProblem.st	Tue Jan 29 14:40:26 2013 +0000
@@ -1193,6 +1193,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.5 2012/09/13 17:30:14 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: ProjectProblem.st 1971 2012-09-27 19:37:25Z vranyj1 $'
+    ^ '§Id: ProjectProblem.st 1971 2012-09-27 19:37:25Z vranyj1 §'
 ! !
+
--- a/SVNVersionInfo.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SVNVersionInfo.st	Tue Jan 29 14:40:26 2013 +0000
@@ -159,6 +159,12 @@
     ^ '$Header: /cvs/stx/stx/libbasic3/SVNVersionInfo.st,v 1.7 2012/07/31 12:18:19 vrany Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: SVNVersionInfo.st 1957 2012-09-05 11:45:38Z vranyj1 $'
+    ^ '§Id: SVNVersionInfo.st 1957 2012-09-05 11:45:38Z vranyj1 §'
 ! !
+
--- a/SourceCodeCache.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SourceCodeCache.st	Tue Jan 29 14:40:26 2013 +0000
@@ -141,13 +141,19 @@
 !SourceCodeCache class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SourceCodeCache.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: SourceCodeCache.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeCache.st,v 1.2 2011/12/01 10:52:43 vrany Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: SourceCodeCache.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: SourceCodeCache.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/SourceCodeManagerError.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SourceCodeManagerError.st	Tue Jan 29 14:40:26 2013 +0000
@@ -37,9 +37,15 @@
 !SourceCodeManagerError class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SourceCodeManagerError.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: SourceCodeManagerError.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: SourceCodeManagerError.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: SourceCodeManagerError.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/SourceCodeManagerUtilities.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SourceCodeManagerUtilities.st	Tue Jan 29 14:40:26 2013 +0000
@@ -3831,13 +3831,19 @@
 !SourceCodeManagerUtilities class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SourceCodeManagerUtilities.st 1985 2013-01-16 11:55:57Z vranyj1 $'
+    ^ '$Header: SourceCodeManagerUtilities.st 1985 2013-01-16 11:55:57Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilities.st,v 1.264 2012/11/07 16:54:17 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id:: SourceCodeManagerUtilities.st 1985 2013-01-16 11:55:57Z vranyj1                                                        $'
+    ^ '§Id:: SourceCodeManagerUtilities.st 1985 2013-01-16 11:55:57Z vranyj1                                                        §'
 ! !
+
--- a/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SourceCodeManagerUtilitiesForContainerBasedManagers.st	Tue Jan 29 14:40:26 2013 +0000
@@ -712,6 +712,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForContainerBasedManagers.st,v 1.3 2012/10/30 14:34:22 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id:: SourceCodeManagerUtilitiesForContainerBasedManagers.st 1981 2012-11-30 17:20:01Z vranyj1                               $'
+    ^ '§Id:: SourceCodeManagerUtilitiesForContainerBasedManagers.st 1981 2012-11-30 17:20:01Z vranyj1                               §'
 ! !
+
--- a/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st	Tue Jan 29 14:40:26 2013 +0000
@@ -220,6 +220,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st,v 1.3 2012/09/26 16:17:41 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id:: SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st 1971 2012-09-27 19:37:25Z vranyj1                               $'
+    ^ '§Id:: SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st 1971 2012-09-27 19:37:25Z vranyj1                               §'
 ! !
+
--- a/StoreSourceCodeManager.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/StoreSourceCodeManager.st	Tue Jan 29 14:40:26 2013 +0000
@@ -449,6 +449,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/StoreSourceCodeManager.st,v 1.23 2012/01/19 15:19:57 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: StoreSourceCodeManager.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: StoreSourceCodeManager.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/SystemOrganizer.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/SystemOrganizer.st	Tue Jan 29 14:40:26 2013 +0000
@@ -244,13 +244,19 @@
 !SystemOrganizer class methodsFor:'documentation'!
 
 version
-    ^ '$Id: SystemOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: SystemOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
 !
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/SystemOrganizer.st,v 1.14 2011/08/20 16:30:14 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: SystemOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: SystemOrganizer.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/TimestampChange.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/TimestampChange.st	Tue Jan 29 14:40:26 2013 +0000
@@ -56,9 +56,15 @@
 !TimestampChange class methodsFor:'documentation'!
 
 version
-    ^ '$Id: TimestampChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '$Header: TimestampChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: TimestampChange.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: TimestampChange.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/TraceBuffer.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/TraceBuffer.st	Tue Jan 29 14:40:26 2013 +0000
@@ -135,6 +135,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/TraceBuffer.st,v 1.2 2010/12/03 09:08:31 stefan Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: TraceBuffer.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: TraceBuffer.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/VersionInfo.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/VersionInfo.st	Tue Jan 29 14:40:26 2013 +0000
@@ -188,6 +188,12 @@
     ^ '§Header: /cvs/stx/stx/libbasic3/VersionInfo.st,v 1.6 2011/12/22 08:59:53 cg Exp §'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
-    ^ '$Id: VersionInfo.st 1909 2012-03-31 00:14:49Z vranyj1 $'
+    ^ '§Id: VersionInfo.st 1909 2012-03-31 00:14:49Z vranyj1 §'
 ! !
+
--- a/WrappedMethod.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/WrappedMethod.st	Tue Jan 29 14:40:26 2013 +0000
@@ -54,6 +54,11 @@
 
 version_CVS
     ^ '§Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.33 2012/10/22 08:13:16 cg Exp §'
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !
 
 !WrappedMethod class methodsFor:'registration'!
@@ -355,14 +360,10 @@
 !WrappedMethod class methodsFor:'documentation'!
 
 version
-    ^ '$Id: WrappedMethod.st 1985 2013-01-16 11:55:57Z vranyj1 $'
-!
-
-version_HG
-
-    ^ '§Changeset: <not expanded> §'
+    ^ '$Header: WrappedMethod.st 1985 2013-01-16 11:55:57Z vranyj1 $'
 !
 
 version_SVN
-    ^ '$Id:: WrappedMethod.st 1985 2013-01-16 11:55:57Z vranyj1                                                                     $'
+    ^ '§Id:: WrappedMethod.st 1985 2013-01-16 11:55:57Z vranyj1                                                                     §'
 ! !
+
--- a/bc.mak	Mon Jan 21 09:21:30 2013 +0000
+++ b/bc.mak	Tue Jan 29 14:40:26 2013 +0000
@@ -37,7 +37,7 @@
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libdb\libsqlite -I$(INCLUDE_TOP)\stx\libdb\libodbc
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libdb\libodbc -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libdb\libsqlite -I$(INCLUDE_TOP)\stx\libbasic2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
@@ -53,13 +53,12 @@
 
 # build all prerequisite packages for this package
 prereq:
+	pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
@@ -76,7 +75,7 @@
 $(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -112,7 +111,7 @@
 $(OUTDIR)MethodChangeNotificationParameter.$(O) MethodChangeNotificationParameter.$(H): MethodChangeNotificationParameter.st $(INCLUDE_TOP)\stx\libbasic3\ChangeNotificationParameter.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)NameSpaceCreationChange.$(O) NameSpaceCreationChange.$(H): NameSpaceCreationChange.st $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)OtherChange.$(O) OtherChange.$(H): OtherChange.st $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(STCHDR)
+$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
 $(OUTDIR)SVNVersionInfo.$(O) SVNVersionInfo.$(H): SVNVersionInfo.st $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) SourceCodeManagerUtilitiesForContainerBasedManagers.$(H): SourceCodeManagerUtilitiesForContainerBasedManagers.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H): SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -144,3 +143,12 @@
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libbasic3.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/extensions.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/extensions.st	Tue Jan 29 14:40:26 2013 +0000
@@ -141,6 +141,7 @@
 
 !stx_libbasic3 class methodsFor:'documentation'!
 
-extensionsVersion_SVN
-    ^ '$Id:: extensions.st 1911 2012-04-03 17:14:36Z vranyj1                                                                        $'
+extensionsVersion_HG
+
+    ^ '$Changeset: <not expanded> $'
 ! !
\ No newline at end of file
--- a/libbasic3.rc	Mon Jan 21 09:21:30 2013 +0000
+++ b/libbasic3.rc	Tue Jan 29 14:40:26 2013 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic3.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,1985,1985
+  FILEVERSION     6,2,32767,32767
   PRODUCTVERSION  6,2,3,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Additional Developer Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.1985.1985\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
       VALUE "InternalName", "stx:libbasic3\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Thu, 17 Jan 2013 17:03:31 GMT\0"
+      VALUE "ProductDate", "Tue, 29 Jan 2013 14:37:52 GMT\0"
     END
 
   END
--- a/stx_libbasic3.st	Mon Jan 21 09:21:30 2013 +0000
+++ b/stx_libbasic3.st	Tue Jan 29 14:40:26 2013 +0000
@@ -39,6 +39,10 @@
     Build- and package information for creation of the st/x standard library: stx_libbasic3.
     This library contains source-code-management, packaging and history related stuff.
 "
+!
+
+extensionsVersion_SVN
+    ^ '$Id:: extensions.st 1911 2012-04-03 17:14:36Z vranyj1                                                                        $'
 ! !
 
 !stx_libbasic3 class methodsFor:'description'!
@@ -239,9 +243,14 @@
 !stx_libbasic3 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: stx_libbasic3.st 1985 2013-01-16 11:55:57Z vranyj1 $'
+    ^ '$Header: stx_libbasic3.st 1985 2013-01-16 11:55:57Z vranyj1 $'
+!
+
+version_HG
+    ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id:: stx_libbasic3.st 1985 2013-01-16 11:55:57Z vranyj1                                                                     $'
+    ^ '§Id:: stx_libbasic3.st 1985 2013-01-16 11:55:57Z vranyj1                                                                     §'
 ! !
+