--- a/mercurial/HGCachedFileData.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/HGCachedFileData.st	Thu Feb 08 09:54:32 2018 +0000
@@ -18,6 +18,8 @@
 "
 "{ Package: 'stx:libscm/mercurial' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#HGCachedFileData
 	instanceVariableNames:'file exists timestamp size data reader'
 	classVariableNames:''
@@ -70,7 +72,7 @@
                 and:[timestamp notNil
                 and:[fmodtime <= timestamp
                 and:[finfo size = size]]]) 
-                ifTrue:[ 
+                ifTrue:[
                     ^ data 
                 ].
         ] ifFalse:[ 
@@ -90,7 +92,7 @@
     ^data
 
     "Created: / 14-01-2013 / 16:25:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 21-03-2014 / 00:45:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-02-2018 / 15:10:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGCachedFileData methodsFor:'initialization'!

--- a/mercurial/HGChangeset.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/HGChangeset.st	Thu Feb 08 09:54:32 2018 +0000
@@ -22,7 +22,7 @@
 
 HGRepositoryObject subclass:#HGChangeset
 	instanceVariableNames:'lazy id branches bookmarks author timestamp message summary
-		parent1 parent2 root rootPackage changes'
+		parent1 parent2 root rootPackage changes obsolete successors'
 	classVariableNames:'NullChangeset'
 	poolDictionaries:''
 	category:'SCM-Mercurial-Core'
@@ -333,6 +333,46 @@
     "Created: / 06-03-2014 / 09:22:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+successors
+    "Return the list of successors for this changeset."
+
+    "/ In theory, we coould (and should) use HGCachedFileData, however
+    "/ at least on UNIX systems the timestamp resolution is only 1sec
+    "/ which is too coarse to work reliably on modern fast machines.
+    "/
+    "/ Sp, no caching until we get at least milliscond resolution. 
+    "/ Sigh.
+    "
+    successors isNil ifTrue:[ 
+        successors := HGCachedFileData
+                        on: repository pathToHgStore00changelog_i
+                        reader:[
+                            | ids |    
+
+                            ids := repository execute:
+                                        (HGCommand log
+                                            workingDirectory: repository path asString;
+                                            revset: 'successors(', id printStringWithoutNumber, ')';
+                                            hidden: true; 
+                                            yourself).  
+                            ids collect:[ :id | repository changesetWithId: id ]                            
+                        ].       
+    ].
+    ^ successors value.
+    "
+    | ids |    
+
+    ids := repository execute:
+                (HGCommand log
+                    workingDirectory: repository path asString;
+                    revset: 'successors(', id printStringWithoutNumber, ')';
+                    hidden: true; 
+                    yourself).  
+    ^ids collect:[ :id | repository changesetWithId: id ]                            
+
+    "Created: / 08-02-2018 / 15:27:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 summary
     summary isNil ifTrue:[
         self ensureNotLazy.
@@ -608,6 +648,40 @@
     ^true
 
     "Created: / 22-01-2013 / 13:38:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isObsolete
+    "Return `true`, if the changeset is obsolete, `false` otherwise."
+
+    "/ In theory, we coould (and should) use HGCachedFileData, however
+    "/ at least on UNIX systems the timestamp resolution is only 1sec
+    "/ which is too coarse to work reliably on modern fast machines.
+    "/
+    "/ Sp, no caching until we get at least milliscond resolution. 
+    "/ Sigh.
+    "
+    obsolete isNil ifTrue:[
+        obsolete := HGCachedFileData
+                        on: repository pathToHgStore00changelog_i
+                        reader:[
+                            [ 
+                                repository log: id printStringWithoutNumber limit: 1.
+                                false
+                            ] on: HGObsoleteRevisionError do:[
+                                true
+                            ]
+                        ].                                
+    ].
+    ^obsolete value.
+    "
+    ^ [ 
+        repository log: id printStringWithoutNumber limit: 1.
+        false
+    ] on: HGObsoleteRevisionError do:[
+        true
+    ]
+
+    "Created: / 08-02-2018 / 09:14:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGChangeset methodsFor:'utilities'!

--- a/mercurial/HGCommandParser.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/HGCommandParser.st	Thu Feb 08 09:54:32 2018 +0000
@@ -1288,6 +1288,16 @@
         self propagate: err.
         ^ self.
     ].
+    (errorMessage startsWith: 'hidden revision ''') ifTrue:[
+        | rev err |
+
+        rev := HGChangesetId readFrom: (errorMessage readStream skip: 'hidden revision ''' size) onError:[ self error: 'Cannot parse changeset ID from error message!!' ].
+        err := HGObsoleteRevisionError newException
+                    parameter: rev;
+                    messageText: errorMessage; yourself.
+        self propagate: err.
+        ^ self.
+    ].
     parseBlock value: errorMessage
 
     "Created: / 08-02-2018 / 08:51:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"

--- a/mercurial/HGCommandParserTests.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/HGCommandParserTests.st	Thu Feb 08 09:54:32 2018 +0000
@@ -729,7 +729,10 @@
      Sigh."
 
     self should:[ (HGCommandParser on: 'abort: unknown revision ''96DB65258808720D8D5EA6CB7A6A4D4F4E467325''!!\' withCRs) parseError ] 
-         raise: HGUnknownRevisionError suchThat:[ :ex | ex parameter = '96DB65258808720D8D5EA6CB7A6A4D4F4E467325' asHGChangesetId ]
+         raise: HGUnknownRevisionError suchThat:[ :ex | ex parameter = '96DB65258808720D8D5EA6CB7A6A4D4F4E467325' asHGChangesetId ].
+
+    self should:[ (HGCommandParser on: 'abort: hidden revision ''96DB65258808720D8D5EA6CB7A6A4D4F4E467325''!!\(use --hidden to access hidden revisions)' withCRs) parseError ] 
+         raise: HGObsoleteRevisionError suchThat:[ :ex | ex parameter = '96DB65258808720D8D5EA6CB7A6A4D4F4E467325' asHGChangesetId ]
 
     "Created: / 08-02-2018 / 08:32:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/HGObsoleteRevisionError.st	Thu Feb 08 09:54:32 2018 +0000
@@ -0,0 +1,52 @@
+"
+stx:libscm - a new source code management library for Smalltalk/X
+Copyright (C) 2012-2015 Jan Vrany
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License. 
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+"
+"{ Package: 'stx:libscm/mercurial' }"
+
+"{ NameSpace: Smalltalk }"
+
+HGRepositoryError subclass:#HGObsoleteRevisionError
+	instanceVariableNames:''
+	classVariableNames:''
+	poolDictionaries:''
+	category:'SCM-Mercurial-Exceptions'
+!
+
+!HGObsoleteRevisionError class methodsFor:'documentation'!
+
+copyright
+"
+stx:libscm - a new source code management library for Smalltalk/X
+Copyright (C) 2012-2015 Jan Vrany
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License. 
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+"
+! !
+

--- a/mercurial/HGTests.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/HGTests.st	Thu Feb 08 09:54:32 2018 +0000
@@ -1132,6 +1132,60 @@
 
     "Created: / 25-08-2015 / 16:14:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 01-01-2018 / 20:59:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_commit_09a
+    "
+    Test support for obsolete changesets
+    "
+
+    | repo wc cs0 cs1 cs2 cs3 |
+
+    repo := self repositoryNamed:'test_repo_01'.
+    self skipIf: repo hasExtensionEvolve not description: 'evolve extension is required to test obsolete changesets'.
+    wc := repo workingCopy.
+    cs0 := wc changeset.
+    self assert: cs0 isObsolete not.
+
+    ( wc / 'f1.txt' ) writingFileDo:[:s | s nextPutAll:'modified from ', testSelector, ' 1'. ].
+    wc commit:testSelector ,' 1'.
+    cs1 := wc changeset.
+    self assert: cs0 isObsolete not.
+    self assert: cs0 successors isEmpty.
+    self assert: cs1 isObsolete not.
+    self assert: cs1 successors isEmpty.
+
+    ( wc / 'f1.txt' ) writingFileDo:[:s | s nextPutAll:'modified from ', testSelector, ' 2'. ].
+    wc commit:testSelector ,' 2' files: nil author: nil amend: true.
+    cs2 := wc changeset.
+    self assert: cs0 isObsolete not.
+    self assert: cs0 successors isEmpty.
+    self assert: cs1 isObsolete.
+    self assert: cs1 successors size == 1.
+    self assert:(cs1 successors includes: cs2).
+    self assert: cs2 isObsolete not. 
+    self assert: cs2 successors isEmpty.
+
+
+
+    ( wc / 'f1.txt' ) writingFileDo:[:s | s nextPutAll:'modified from ', testSelector, ' 3'. ].
+    wc commit:testSelector ,' 3' files: nil author: nil amend: true.
+    cs3 := wc changeset.
+    self assert: cs0 isObsolete not.
+    self assert: cs1 isObsolete.
+    self assert: cs1 successors size == 1.
+    self assert:(cs1 successors includes: cs2).
+    self assert: cs2 isObsolete.    
+    self assert: cs2 successors size == 1.
+    self assert:(cs2 successors includes: cs3).
+    self assert: cs3 isObsolete not.
+
+     "
+     UserPreferences fileBrowserClass openOn: repo path .
+    "
+
+    "Created: / 08-02-2018 / 09:35:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-02-2018 / 15:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGTests methodsFor:'tests - mercurial'!

--- a/mercurial/Make.proto	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/Make.proto	Thu Feb 08 09:54:32 2018 +0000
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libjava/tools -I$(INCLUDE_TOP)/stx/libscm/common -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libhtml -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libjava/tools -I$(INCLUDE_TOP)/stx/libscm/common -I$(INCLUDE_TOP)/stx/libtool -I$(INCLUDE_TOP)/stx/libtool2 -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libwidg -I$(INCLUDE_TOP)/stx/libwidg2
 
 
 # if you need any additional defines for embedded C code,
@@ -94,7 +94,7 @@
 		sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libscm_mercurial.svn.st; \
 	fi
 	$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libscm_mercurial.svn $(C_RULE);
-	sed -i -e "s/\".stx_libscm_mercurial.svn.st\");/\"\stx_libscm_mercurial.st\");/g" .stx_libscm_mercurial.svn.c
+	sed -i -e "s/\".stx_libscm_mercurial.svn.st\");/\"stx_libscm_mercurial.st\");/g" .stx_libscm_mercurial.svn.c
 	$(MAKE) .stx_libscm_mercurial.svn.$(O)
 	@mv .stx_libscm_mercurial.svn.$(O) stx_libscm_mercurial.$(O)
 endif
@@ -132,19 +132,18 @@
 
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../common && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../common && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
@@ -164,66 +163,67 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)HG2CVS.$(O) HG2CVS.$(H): HG2CVS.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGAuthorQuery.$(O) HGAuthorQuery.$(H): HGAuthorQuery.st $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(STCHDR)
-$(OUTDIR)HGCachedFileData.$(O) HGCachedFileData.$(H): HGCachedFileData.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGChange.$(O) HGChange.$(H): HGChange.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetBrowser.$(O) HGChangesetBrowser.$(H): HGChangesetBrowser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetDialog.$(O) HGChangesetDialog.$(H): HGChangesetDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetFile.$(O) HGChangesetFile.$(H): HGChangesetFile.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetId.$(O) HGChangesetId.$(H): HGChangesetId.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetLabelsView.$(O) HGChangesetLabelsView.$(H): HGChangesetLabelsView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetList.$(O) HGChangesetList.$(H): HGChangesetList.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetPresenter.$(O) HGChangesetPresenter.$(H): HGChangesetPresenter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetViewer.$(O) HGChangesetViewer.$(H): HGChangesetViewer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)HGCommandParser.$(O) HGCommandParser.$(H): HGCommandParser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGCommitDialog.$(O) HGCommitDialog.$(H): HGCommitDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractCommitDialog.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
-$(OUTDIR)HGCommitTask.$(O) HGCommitTask.$(H): HGCommitTask.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractCommitTask.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractFileoutLikeTask.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractTask.$(H) $(STCHDR)
-$(OUTDIR)HGDebugFlags.$(O) HGDebugFlags.$(H): HGDebugFlags.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(STCHDR)
-$(OUTDIR)HGError.$(O) HGError.$(H): HGError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGIconLibrary.$(O) HGIconLibrary.$(H): HGIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGMergeInfo.$(O) HGMergeInfo.$(H): HGMergeInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGMergeTool.$(O) HGMergeTool.$(H): HGMergeTool.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGNotification.$(O) HGNotification.$(H): HGNotification.st $(INCLUDE_TOP)/stx/libbasic/ActivityNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(STCHDR)
-$(OUTDIR)HGPackageRevision.$(O) HGPackageRevision.$(H): HGPackageRevision.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageRevision.$(H) $(STCHDR)
-$(OUTDIR)HGPackageWorkingCopy.$(O) HGPackageWorkingCopy.$(H): HGPackageWorkingCopy.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageWorkingCopy.$(H) $(STCHDR)
-$(OUTDIR)HGPackageWorkingCopyRegistry.$(O) HGPackageWorkingCopyRegistry.$(H): HGPackageWorkingCopyRegistry.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageWorkingCopyRegistry.$(H) $(STCHDR)
-$(OUTDIR)HGPushPullInfo.$(O) HGPushPullInfo.$(H): HGPushPullInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGRepositoryObject.$(O) HGRepositoryObject.$(H): HGRepositoryObject.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGRevisionAnnotation.$(O) HGRevisionAnnotation.$(H): HGRevisionAnnotation.st $(INCLUDE_TOP)/stx/libbasic/Annotation.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGRevisionInfo.$(O) HGRevisionInfo.$(H): HGRevisionInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractRevisionInfo.$(H) $(STCHDR)
-$(OUTDIR)HGRevset.$(O) HGRevset.$(H): HGRevset.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)HGRevsetEditor.$(O) HGRevsetEditor.$(H): HGRevsetEditor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)HGSourceCodeManagementSettingsAppl.$(O) HGSourceCodeManagementSettingsAppl.$(H): HGSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)HGSourceCodeManager.$(O) HGSourceCodeManager.$(H): HGSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractSourceCodeManager.$(H) $(STCHDR)
-$(OUTDIR)HGSourceCodeManagerUtilities.$(O) HGSourceCodeManagerUtilities.$(H): HGSourceCodeManagerUtilities.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMCommonSourceCodeManagerUtilities.$(H) $(STCHDR)
-$(OUTDIR)HGStatus.$(O) HGStatus.$(H): HGStatus.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/Singleton.$(H) $(STCHDR)
-$(OUTDIR)HGWarning.$(O) HGWarning.$(H): HGWarning.st $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/Warning.$(H) $(STCHDR)
-$(OUTDIR)HGWorkingCopyFile.$(O) HGWorkingCopyFile.$(H): HGWorkingCopyFile.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libscm_mercurial.$(O) stx_libscm_mercurial.$(H): stx_libscm_mercurial.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
-$(OUTDIR)HGBookmarkError.$(O) HGBookmarkError.$(H): HGBookmarkError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGChangeset.$(O) HGChangeset.$(H): HGChangeset.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetLabel.$(O) HGChangesetLabel.$(H): HGChangesetLabel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGCommand.$(O) HGCommand.$(H): HGCommand.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGDebugFlags.$(H) $(STCHDR)
-$(OUTDIR)HGCommandError.$(O) HGCommandError.$(H): HGCommandError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGCommandServer.$(O) HGCommandServer.$(H): HGCommandServer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGDebugFlags.$(H) $(STCHDR)
-$(OUTDIR)HGCommitError.$(O) HGCommitError.$(H): HGCommitError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGConfig.$(O) HGConfig.$(H): HGConfig.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGNoSuchBranchError.$(O) HGNoSuchBranchError.$(H): HGNoSuchBranchError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGRemote.$(O) HGRemote.$(H): HGRemote.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGRepository.$(O) HGRepository.$(H): HGRepository.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGRepositoryError.$(O) HGRepositoryError.$(H): HGRepositoryError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGWorkingCopy.$(O) HGWorkingCopy.$(H): HGWorkingCopy.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGBranch.$(O) HGBranch.$(H): HGBranch.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGCommandParseError.$(O) HGCommandParseError.$(H): HGCommandParseError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGCommandError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGInvalidExecutableError.$(O) HGInvalidExecutableError.$(H): HGInvalidExecutableError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGCommandError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGInvalidVersionError.$(O) HGInvalidVersionError.$(H): HGInvalidVersionError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGCommandError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
-$(OUTDIR)HGPushError.$(O) HGPushError.$(H): HGPushError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
-$(OUTDIR)HGTagOrBookmark.$(O) HGTagOrBookmark.$(H): HGTagOrBookmark.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGUnknownRevisionError.$(O) HGUnknownRevisionError.$(H): HGUnknownRevisionError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
-$(OUTDIR)HGBookmark.$(O) HGBookmark.$(H): HGBookmark.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGTagOrBookmark.$(H) $(STCHDR)
-$(OUTDIR)HGPushWouldCreateNewHeadError.$(O) HGPushWouldCreateNewHeadError.$(H): HGPushWouldCreateNewHeadError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGPushError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
-$(OUTDIR)HGTag.$(O) HGTag.$(H): HGTag.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGTagOrBookmark.$(H) $(STCHDR)
+$(OUTDIR)HG2CVS.$(O) HG2CVS.$(C) HG2CVS.$(H): HG2CVS.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGAuthorQuery.$(O) HGAuthorQuery.$(C) HGAuthorQuery.$(H): HGAuthorQuery.st $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(STCHDR)
+$(OUTDIR)HGCachedFileData.$(O) HGCachedFileData.$(C) HGCachedFileData.$(H): HGCachedFileData.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGChange.$(O) HGChange.$(C) HGChange.$(H): HGChange.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetBrowser.$(O) HGChangesetBrowser.$(C) HGChangesetBrowser.$(H): HGChangesetBrowser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetDialog.$(O) HGChangesetDialog.$(C) HGChangesetDialog.$(H): HGChangesetDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetFile.$(O) HGChangesetFile.$(C) HGChangesetFile.$(H): HGChangesetFile.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetId.$(O) HGChangesetId.$(C) HGChangesetId.$(H): HGChangesetId.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetLabelsView.$(O) HGChangesetLabelsView.$(C) HGChangesetLabelsView.$(H): HGChangesetLabelsView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetList.$(O) HGChangesetList.$(C) HGChangesetList.$(H): HGChangesetList.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetPresenter.$(O) HGChangesetPresenter.$(C) HGChangesetPresenter.$(H): HGChangesetPresenter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetViewer.$(O) HGChangesetViewer.$(C) HGChangesetViewer.$(H): HGChangesetViewer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)HGCommandParser.$(O) HGCommandParser.$(C) HGCommandParser.$(H): HGCommandParser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGCommitDialog.$(O) HGCommitDialog.$(C) HGCommitDialog.$(H): HGCommitDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractCommitDialog.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractDialog.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
+$(OUTDIR)HGCommitTask.$(O) HGCommitTask.$(C) HGCommitTask.$(H): HGCommitTask.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractCommitTask.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractFileoutLikeTask.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractTask.$(H) $(STCHDR)
+$(OUTDIR)HGDebugFlags.$(O) HGDebugFlags.$(C) HGDebugFlags.$(H): HGDebugFlags.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(STCHDR)
+$(OUTDIR)HGError.$(O) HGError.$(C) HGError.$(H): HGError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGIconLibrary.$(O) HGIconLibrary.$(C) HGIconLibrary.$(H): HGIconLibrary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGMergeInfo.$(O) HGMergeInfo.$(C) HGMergeInfo.$(H): HGMergeInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGMergeTool.$(O) HGMergeTool.$(C) HGMergeTool.$(H): HGMergeTool.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGNotification.$(O) HGNotification.$(C) HGNotification.$(H): HGNotification.st $(INCLUDE_TOP)/stx/libbasic/ActivityNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(STCHDR)
+$(OUTDIR)HGPackageRevision.$(O) HGPackageRevision.$(C) HGPackageRevision.$(H): HGPackageRevision.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageRevision.$(H) $(STCHDR)
+$(OUTDIR)HGPackageWorkingCopy.$(O) HGPackageWorkingCopy.$(C) HGPackageWorkingCopy.$(H): HGPackageWorkingCopy.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageWorkingCopy.$(H) $(STCHDR)
+$(OUTDIR)HGPackageWorkingCopyRegistry.$(O) HGPackageWorkingCopyRegistry.$(C) HGPackageWorkingCopyRegistry.$(H): HGPackageWorkingCopyRegistry.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractPackageWorkingCopyRegistry.$(H) $(STCHDR)
+$(OUTDIR)HGPushPullInfo.$(O) HGPushPullInfo.$(C) HGPushPullInfo.$(H): HGPushPullInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGRepositoryObject.$(O) HGRepositoryObject.$(C) HGRepositoryObject.$(H): HGRepositoryObject.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGRevisionAnnotation.$(O) HGRevisionAnnotation.$(C) HGRevisionAnnotation.$(H): HGRevisionAnnotation.st $(INCLUDE_TOP)/stx/libbasic/Annotation.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGRevisionInfo.$(O) HGRevisionInfo.$(C) HGRevisionInfo.$(H): HGRevisionInfo.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractRevisionInfo.$(H) $(STCHDR)
+$(OUTDIR)HGRevset.$(O) HGRevset.$(C) HGRevset.$(H): HGRevset.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)HGRevsetEditor.$(O) HGRevsetEditor.$(C) HGRevsetEditor.$(H): HGRevsetEditor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)HGSourceCodeManagementSettingsAppl.$(O) HGSourceCodeManagementSettingsAppl.$(C) HGSourceCodeManagementSettingsAppl.$(H): HGSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)HGSourceCodeManager.$(O) HGSourceCodeManager.$(C) HGSourceCodeManager.$(H): HGSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMAbstractSourceCodeManager.$(H) $(STCHDR)
+$(OUTDIR)HGSourceCodeManagerUtilities.$(O) HGSourceCodeManagerUtilities.$(C) HGSourceCodeManagerUtilities.$(H): HGSourceCodeManagerUtilities.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libscm/common/SCMCommonSourceCodeManagerUtilities.$(H) $(STCHDR)
+$(OUTDIR)HGStatus.$(O) HGStatus.$(C) HGStatus.$(H): HGStatus.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic2/Singleton.$(H) $(STCHDR)
+$(OUTDIR)HGWarning.$(O) HGWarning.$(C) HGWarning.$(H): HGWarning.st $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/Warning.$(H) $(STCHDR)
+$(OUTDIR)HGWorkingCopyFile.$(O) HGWorkingCopyFile.$(C) HGWorkingCopyFile.$(H): HGWorkingCopyFile.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libscm_mercurial.$(O) stx_libscm_mercurial.$(C) stx_libscm_mercurial.$(H): stx_libscm_mercurial.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)HGBookmarkError.$(O) HGBookmarkError.$(C) HGBookmarkError.$(H): HGBookmarkError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGChangeset.$(O) HGChangeset.$(C) HGChangeset.$(H): HGChangeset.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetLabel.$(O) HGChangesetLabel.$(C) HGChangesetLabel.$(H): HGChangesetLabel.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGCommand.$(O) HGCommand.$(C) HGCommand.$(H): HGCommand.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGDebugFlags.$(H) $(STCHDR)
+$(OUTDIR)HGCommandError.$(O) HGCommandError.$(C) HGCommandError.$(H): HGCommandError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGCommandServer.$(O) HGCommandServer.$(C) HGCommandServer.$(H): HGCommandServer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGDebugFlags.$(H) $(STCHDR)
+$(OUTDIR)HGCommitError.$(O) HGCommitError.$(C) HGCommitError.$(H): HGCommitError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGConfig.$(O) HGConfig.$(C) HGConfig.$(H): HGConfig.st $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGNoSuchBranchError.$(O) HGNoSuchBranchError.$(C) HGNoSuchBranchError.$(H): HGNoSuchBranchError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGRemote.$(O) HGRemote.$(C) HGRemote.$(H): HGRemote.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGRepository.$(O) HGRepository.$(C) HGRepository.$(H): HGRepository.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGRepositoryError.$(O) HGRepositoryError.$(C) HGRepositoryError.$(H): HGRepositoryError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGWorkingCopy.$(O) HGWorkingCopy.$(C) HGWorkingCopy.$(H): HGWorkingCopy.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGBranch.$(O) HGBranch.$(C) HGBranch.$(H): HGBranch.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGCommandParseError.$(O) HGCommandParseError.$(C) HGCommandParseError.$(H): HGCommandParseError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGCommandError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGInvalidExecutableError.$(O) HGInvalidExecutableError.$(C) HGInvalidExecutableError.$(H): HGInvalidExecutableError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGCommandError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGInvalidVersionError.$(O) HGInvalidVersionError.$(C) HGInvalidVersionError.$(H): HGInvalidVersionError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGCommandError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(STCHDR)
+$(OUTDIR)HGObsoleteRevisionError.$(O) HGObsoleteRevisionError.$(C) HGObsoleteRevisionError.$(H): HGObsoleteRevisionError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGPushError.$(O) HGPushError.$(C) HGPushError.$(H): HGPushError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGTagOrBookmark.$(O) HGTagOrBookmark.$(C) HGTagOrBookmark.$(H): HGTagOrBookmark.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGUnknownRevisionError.$(O) HGUnknownRevisionError.$(C) HGUnknownRevisionError.$(H): HGUnknownRevisionError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGBookmark.$(O) HGBookmark.$(C) HGBookmark.$(H): HGBookmark.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGTagOrBookmark.$(H) $(STCHDR)
+$(OUTDIR)HGPushWouldCreateNewHeadError.$(O) HGPushWouldCreateNewHeadError.$(C) HGPushWouldCreateNewHeadError.$(H): HGPushWouldCreateNewHeadError.st $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGPushError.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGTag.$(O) HGTag.$(C) HGTag.$(H): HGTag.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGChangesetLabel.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGRepositoryObject.$(H) $(INCLUDE_TOP)/stx/libscm/mercurial/HGTagOrBookmark.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Annotation.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractFileBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line

--- a/mercurial/Make.spec	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/Make.spec	Thu Feb 08 09:54:32 2018 +0000
@@ -22,7 +22,7 @@
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
+#  -Dxxx       : defines passed to CC for inline C-code
 #  -Ixxx       : include path passed to CC for inline C-code
 #  +optspace   : optimized for space
 #  +optspace2  : optimized more for space
@@ -105,6 +105,7 @@
 	HGCommandParseError \
 	HGInvalidExecutableError \
 	HGInvalidVersionError \
+	HGObsoleteRevisionError \
 	HGPushError \
 	HGTagOrBookmark \
 	HGUnknownRevisionError \
@@ -116,67 +117,68 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR_SLASH)HG2CVS.$(O) \
-    $(OUTDIR_SLASH)HGAuthorQuery.$(O) \
-    $(OUTDIR_SLASH)HGCachedFileData.$(O) \
-    $(OUTDIR_SLASH)HGChange.$(O) \
-    $(OUTDIR_SLASH)HGChangesetBrowser.$(O) \
-    $(OUTDIR_SLASH)HGChangesetDialog.$(O) \
-    $(OUTDIR_SLASH)HGChangesetFile.$(O) \
-    $(OUTDIR_SLASH)HGChangesetId.$(O) \
-    $(OUTDIR_SLASH)HGChangesetLabelsView.$(O) \
-    $(OUTDIR_SLASH)HGChangesetList.$(O) \
-    $(OUTDIR_SLASH)HGChangesetPresenter.$(O) \
-    $(OUTDIR_SLASH)HGChangesetViewer.$(O) \
-    $(OUTDIR_SLASH)HGCommandParser.$(O) \
-    $(OUTDIR_SLASH)HGCommitDialog.$(O) \
-    $(OUTDIR_SLASH)HGCommitTask.$(O) \
-    $(OUTDIR_SLASH)HGDebugFlags.$(O) \
-    $(OUTDIR_SLASH)HGError.$(O) \
-    $(OUTDIR_SLASH)HGIconLibrary.$(O) \
-    $(OUTDIR_SLASH)HGMergeInfo.$(O) \
-    $(OUTDIR_SLASH)HGMergeTool.$(O) \
-    $(OUTDIR_SLASH)HGNotification.$(O) \
-    $(OUTDIR_SLASH)HGPackageRevision.$(O) \
-    $(OUTDIR_SLASH)HGPackageWorkingCopy.$(O) \
-    $(OUTDIR_SLASH)HGPackageWorkingCopyRegistry.$(O) \
-    $(OUTDIR_SLASH)HGPushPullInfo.$(O) \
-    $(OUTDIR_SLASH)HGRepositoryObject.$(O) \
-    $(OUTDIR_SLASH)HGRevisionAnnotation.$(O) \
-    $(OUTDIR_SLASH)HGRevisionInfo.$(O) \
-    $(OUTDIR_SLASH)HGRevset.$(O) \
-    $(OUTDIR_SLASH)HGRevsetEditor.$(O) \
-    $(OUTDIR_SLASH)HGSourceCodeManagementSettingsAppl.$(O) \
-    $(OUTDIR_SLASH)HGSourceCodeManager.$(O) \
-    $(OUTDIR_SLASH)HGSourceCodeManagerUtilities.$(O) \
-    $(OUTDIR_SLASH)HGStatus.$(O) \
-    $(OUTDIR_SLASH)HGWarning.$(O) \
-    $(OUTDIR_SLASH)HGWorkingCopyFile.$(O) \
-    $(OUTDIR_SLASH)stx_libscm_mercurial.$(O) \
-    $(OUTDIR_SLASH)HGBookmarkError.$(O) \
-    $(OUTDIR_SLASH)HGChangeset.$(O) \
-    $(OUTDIR_SLASH)HGChangesetLabel.$(O) \
-    $(OUTDIR_SLASH)HGCommand.$(O) \
-    $(OUTDIR_SLASH)HGCommandError.$(O) \
-    $(OUTDIR_SLASH)HGCommandServer.$(O) \
-    $(OUTDIR_SLASH)HGCommitError.$(O) \
-    $(OUTDIR_SLASH)HGConfig.$(O) \
-    $(OUTDIR_SLASH)HGNoSuchBranchError.$(O) \
-    $(OUTDIR_SLASH)HGRemote.$(O) \
-    $(OUTDIR_SLASH)HGRepository.$(O) \
-    $(OUTDIR_SLASH)HGRepositoryError.$(O) \
-    $(OUTDIR_SLASH)HGWorkingCopy.$(O) \
-    $(OUTDIR_SLASH)HGBranch.$(O) \
-    $(OUTDIR_SLASH)HGCommandParseError.$(O) \
-    $(OUTDIR_SLASH)HGInvalidExecutableError.$(O) \
-    $(OUTDIR_SLASH)HGInvalidVersionError.$(O) \
-    $(OUTDIR_SLASH)HGPushError.$(O) \
-    $(OUTDIR_SLASH)HGTagOrBookmark.$(O) \
-    $(OUTDIR_SLASH)HGUnknownRevisionError.$(O) \
-    $(OUTDIR_SLASH)HGBookmark.$(O) \
-    $(OUTDIR_SLASH)HGPushWouldCreateNewHeadError.$(O) \
-    $(OUTDIR_SLASH)HGTag.$(O) \
-    $(OUTDIR_SLASH)extensions.$(O) \
+    $(OUTDIR)HG2CVS.$(O) \
+    $(OUTDIR)HGAuthorQuery.$(O) \
+    $(OUTDIR)HGCachedFileData.$(O) \
+    $(OUTDIR)HGChange.$(O) \
+    $(OUTDIR)HGChangesetBrowser.$(O) \
+    $(OUTDIR)HGChangesetDialog.$(O) \
+    $(OUTDIR)HGChangesetFile.$(O) \
+    $(OUTDIR)HGChangesetId.$(O) \
+    $(OUTDIR)HGChangesetLabelsView.$(O) \
+    $(OUTDIR)HGChangesetList.$(O) \
+    $(OUTDIR)HGChangesetPresenter.$(O) \
+    $(OUTDIR)HGChangesetViewer.$(O) \
+    $(OUTDIR)HGCommandParser.$(O) \
+    $(OUTDIR)HGCommitDialog.$(O) \
+    $(OUTDIR)HGCommitTask.$(O) \
+    $(OUTDIR)HGDebugFlags.$(O) \
+    $(OUTDIR)HGError.$(O) \
+    $(OUTDIR)HGIconLibrary.$(O) \
+    $(OUTDIR)HGMergeInfo.$(O) \
+    $(OUTDIR)HGMergeTool.$(O) \
+    $(OUTDIR)HGNotification.$(O) \
+    $(OUTDIR)HGPackageRevision.$(O) \
+    $(OUTDIR)HGPackageWorkingCopy.$(O) \
+    $(OUTDIR)HGPackageWorkingCopyRegistry.$(O) \
+    $(OUTDIR)HGPushPullInfo.$(O) \
+    $(OUTDIR)HGRepositoryObject.$(O) \
+    $(OUTDIR)HGRevisionAnnotation.$(O) \
+    $(OUTDIR)HGRevisionInfo.$(O) \
+    $(OUTDIR)HGRevset.$(O) \
+    $(OUTDIR)HGRevsetEditor.$(O) \
+    $(OUTDIR)HGSourceCodeManagementSettingsAppl.$(O) \
+    $(OUTDIR)HGSourceCodeManager.$(O) \
+    $(OUTDIR)HGSourceCodeManagerUtilities.$(O) \
+    $(OUTDIR)HGStatus.$(O) \
+    $(OUTDIR)HGWarning.$(O) \
+    $(OUTDIR)HGWorkingCopyFile.$(O) \
+    $(OUTDIR)stx_libscm_mercurial.$(O) \
+    $(OUTDIR)HGBookmarkError.$(O) \
+    $(OUTDIR)HGChangeset.$(O) \
+    $(OUTDIR)HGChangesetLabel.$(O) \
+    $(OUTDIR)HGCommand.$(O) \
+    $(OUTDIR)HGCommandError.$(O) \
+    $(OUTDIR)HGCommandServer.$(O) \
+    $(OUTDIR)HGCommitError.$(O) \
+    $(OUTDIR)HGConfig.$(O) \
+    $(OUTDIR)HGNoSuchBranchError.$(O) \
+    $(OUTDIR)HGRemote.$(O) \
+    $(OUTDIR)HGRepository.$(O) \
+    $(OUTDIR)HGRepositoryError.$(O) \
+    $(OUTDIR)HGWorkingCopy.$(O) \
+    $(OUTDIR)HGBranch.$(O) \
+    $(OUTDIR)HGCommandParseError.$(O) \
+    $(OUTDIR)HGInvalidExecutableError.$(O) \
+    $(OUTDIR)HGInvalidVersionError.$(O) \
+    $(OUTDIR)HGObsoleteRevisionError.$(O) \
+    $(OUTDIR)HGPushError.$(O) \
+    $(OUTDIR)HGTagOrBookmark.$(O) \
+    $(OUTDIR)HGUnknownRevisionError.$(O) \
+    $(OUTDIR)HGBookmark.$(O) \
+    $(OUTDIR)HGPushWouldCreateNewHeadError.$(O) \
+    $(OUTDIR)HGTag.$(O) \
+    $(OUTDIR)extensions.$(O) \
 
 
 

--- a/mercurial/abbrev.stc	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/abbrev.stc	Thu Feb 08 09:54:32 2018 +0000
@@ -5,16 +5,16 @@
 HGAuthorQuery HGAuthorQuery stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGCachedFileData HGCachedFileData stx:libscm/mercurial 'SCM-Mercurial-Internal' 0
 HGChange HGChange stx:libscm/mercurial 'SCM-Mercurial-Core' 0
-HGChangesetBrowser HGChangesetBrowser stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
-HGChangesetDialog HGChangesetDialog stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
+HGChangesetBrowser HGChangesetBrowser stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
+HGChangesetDialog HGChangesetDialog stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
 HGChangesetFile HGChangesetFile stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGChangesetId HGChangesetId stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGChangesetLabelsView HGChangesetLabelsView stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
-HGChangesetList HGChangesetList stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
+HGChangesetList HGChangesetList stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
 HGChangesetPresenter HGChangesetPresenter stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 0
-HGChangesetViewer HGChangesetViewer stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
+HGChangesetViewer HGChangesetViewer stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
 HGCommandParser HGCommandParser stx:libscm/mercurial 'SCM-Mercurial-Internal' 0
-HGCommitDialog HGCommitDialog stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
+HGCommitDialog HGCommitDialog stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
 HGCommitTask HGCommitTask stx:libscm/mercurial 'SCM-Mercurial-StX-Tasks' 0
 HGDebugFlags HGDebugFlags stx:libscm/mercurial 'SCM-Mercurial-Internal' 0
 HGError HGError stx:libscm/mercurial 'SCM-Mercurial-Core' 1
@@ -26,17 +26,15 @@
 HGPackageWorkingCopy HGPackageWorkingCopy stx:libscm/mercurial 'SCM-Mercurial-StX' 0
 HGPackageWorkingCopyRegistry HGPackageWorkingCopyRegistry stx:libscm/mercurial 'SCM-Mercurial-StX' 1
 HGPushPullInfo HGPushPullInfo stx:libscm/mercurial 'SCM-Mercurial-Core' 0
-HGRepositoriesResource HGRepositoriesResource stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
 HGRepositoryObject HGRepositoryObject stx:libscm/mercurial 'SCM-Mercurial-Internal' 0
 HGRevisionAnnotation HGRevisionAnnotation stx:libscm/mercurial 'SCM-Mercurial-StX' 0
 HGRevisionInfo HGRevisionInfo stx:libscm/mercurial 'SCM-Mercurial-StX' 0
 HGRevset HGRevset stx:libscm/mercurial 'SCM-Mercurial-Core' 0
-HGRevsetEditor HGRevsetEditor stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
-HGSourceCodeManagementSettingsAppl HGSourceCodeManagementSettingsAppl stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 1
+HGRevsetEditor HGRevsetEditor stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
+HGSourceCodeManagementSettingsAppl HGSourceCodeManagementSettingsAppl stx:libscm/mercurial 'SCM-Mercurial-StX-Interface' 2
 HGSourceCodeManager HGSourceCodeManager stx:libscm/mercurial 'SCM-Mercurial-StX' 2
 HGSourceCodeManagerUtilities HGSourceCodeManagerUtilities stx:libscm/mercurial 'SCM-Mercurial-StX' 0
 HGStatus HGStatus stx:libscm/mercurial 'SCM-Mercurial-Core' 1
-HGTestCase HGTestCase stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
 HGWarning HGWarning stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGWorkingCopyFile HGWorkingCopyFile stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 stx_libscm_mercurial stx_libscm_mercurial stx:libscm/mercurial '* Projects & Packages *' 3
@@ -52,18 +50,21 @@
 HGRemote HGRemote stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGRepository HGRepository stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGRepositoryError HGRepositoryError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
-HGStXTests HGStXTests stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
-HGTests HGTests stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
 HGWorkingCopy HGWorkingCopy stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGBranch HGBranch stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGCommandParseError HGCommandParseError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGInvalidExecutableError HGInvalidExecutableError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGInvalidVersionError HGInvalidVersionError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
+HGObsoleteRevisionError HGObsoleteRevisionError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGPushError HGPushError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGTagOrBookmark HGTagOrBookmark stx:libscm/mercurial 'SCM-Mercurial-Internal' 0
 HGUnknownRevisionError HGUnknownRevisionError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGBookmark HGBookmark stx:libscm/mercurial 'SCM-Mercurial-Core' 0
 HGPushWouldCreateNewHeadError HGPushWouldCreateNewHeadError stx:libscm/mercurial 'SCM-Mercurial-Exceptions' 1
 HGTag HGTag stx:libscm/mercurial 'SCM-Mercurial-Core' 0
+HGRepositoriesResource HGRepositoriesResource stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
+HGTestCase HGTestCase stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
+HGStXTests HGStXTests stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
+HGTests HGTests stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
 HGCommandParserTests HGCommandParserTests stx:libscm/mercurial 'SCM-Mercurial-Tests' 1
 HGInstaller HGInstaller stx:libscm/mercurial 'SCM-Mercurial-StX-Installer' 1

--- a/mercurial/bc.mak	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/bc.mak	Thu Feb 08 09:54:32 2018 +0000
@@ -36,11 +36,11 @@
 
 LIBNAME=libstx_libscm_mercurial
 MODULE_PATH=libscm\mercurial
-RESFILES=mercurial.$(RES)
+RESFILES=stx_libscm_mercurialWINrc.$(RES)
 
 
 
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libjava\tools -I$(INCLUDE_TOP)\stx\libscm\common -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libjava\tools -I$(INCLUDE_TOP)\stx\libscm\common -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libtool2 -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
 LOCALDEFINES=
 
 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
@@ -64,7 +64,6 @@
 	pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-	pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\common & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 	pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -92,70 +91,71 @@
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
         
 clean::
-	del *.$(CSUFFIX)
+	-del *.$(CSUFFIX)
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)HG2CVS.$(O) HG2CVS.$(H): HG2CVS.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGAuthorQuery.$(O) HGAuthorQuery.$(H): HGAuthorQuery.st $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(STCHDR)
-$(OUTDIR)HGCachedFileData.$(O) HGCachedFileData.$(H): HGCachedFileData.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGChange.$(O) HGChange.$(H): HGChange.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetBrowser.$(O) HGChangesetBrowser.$(H): HGChangesetBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetDialog.$(O) HGChangesetDialog.$(H): HGChangesetDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetFile.$(O) HGChangesetFile.$(H): HGChangesetFile.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetId.$(O) HGChangesetId.$(H): HGChangesetId.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetLabelsView.$(O) HGChangesetLabelsView.$(H): HGChangesetLabelsView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetList.$(O) HGChangesetList.$(H): HGChangesetList.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetPresenter.$(O) HGChangesetPresenter.$(H): HGChangesetPresenter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetViewer.$(O) HGChangesetViewer.$(H): HGChangesetViewer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)HGCommandParser.$(O) HGCommandParser.$(H): HGCommandParser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGCommitDialog.$(O) HGCommitDialog.$(H): HGCommitDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractCommitDialog.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractDialog.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
-$(OUTDIR)HGCommitTask.$(O) HGCommitTask.$(H): HGCommitTask.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractCommitTask.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractFileoutLikeTask.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractTask.$(H) $(STCHDR)
-$(OUTDIR)HGDebugFlags.$(O) HGDebugFlags.$(H): HGDebugFlags.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(STCHDR)
-$(OUTDIR)HGError.$(O) HGError.$(H): HGError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGIconLibrary.$(O) HGIconLibrary.$(H): HGIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGMergeInfo.$(O) HGMergeInfo.$(H): HGMergeInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGMergeTool.$(O) HGMergeTool.$(H): HGMergeTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGNotification.$(O) HGNotification.$(H): HGNotification.st $(INCLUDE_TOP)\stx\libbasic\ActivityNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(STCHDR)
-$(OUTDIR)HGPackageRevision.$(O) HGPackageRevision.$(H): HGPackageRevision.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageRevision.$(H) $(STCHDR)
-$(OUTDIR)HGPackageWorkingCopy.$(O) HGPackageWorkingCopy.$(H): HGPackageWorkingCopy.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageWorkingCopy.$(H) $(STCHDR)
-$(OUTDIR)HGPackageWorkingCopyRegistry.$(O) HGPackageWorkingCopyRegistry.$(H): HGPackageWorkingCopyRegistry.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageWorkingCopyRegistry.$(H) $(STCHDR)
-$(OUTDIR)HGPushPullInfo.$(O) HGPushPullInfo.$(H): HGPushPullInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGRepositoryObject.$(O) HGRepositoryObject.$(H): HGRepositoryObject.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGRevisionAnnotation.$(O) HGRevisionAnnotation.$(H): HGRevisionAnnotation.st $(INCLUDE_TOP)\stx\libbasic\Annotation.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGRevisionInfo.$(O) HGRevisionInfo.$(H): HGRevisionInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractRevisionInfo.$(H) $(STCHDR)
-$(OUTDIR)HGRevset.$(O) HGRevset.$(H): HGRevset.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)HGRevsetEditor.$(O) HGRevsetEditor.$(H): HGRevsetEditor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)HGSourceCodeManagementSettingsAppl.$(O) HGSourceCodeManagementSettingsAppl.$(H): HGSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)HGSourceCodeManager.$(O) HGSourceCodeManager.$(H): HGSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractSourceCodeManager.$(H) $(STCHDR)
-$(OUTDIR)HGSourceCodeManagerUtilities.$(O) HGSourceCodeManagerUtilities.$(H): HGSourceCodeManagerUtilities.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMCommonSourceCodeManagerUtilities.$(H) $(STCHDR)
-$(OUTDIR)HGStatus.$(O) HGStatus.$(H): HGStatus.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\Singleton.$(H) $(STCHDR)
-$(OUTDIR)HGWarning.$(O) HGWarning.$(H): HGWarning.st $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\Warning.$(H) $(STCHDR)
-$(OUTDIR)HGWorkingCopyFile.$(O) HGWorkingCopyFile.$(H): HGWorkingCopyFile.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libscm_mercurial.$(O) stx_libscm_mercurial.$(H): stx_libscm_mercurial.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
-$(OUTDIR)HGBookmarkError.$(O) HGBookmarkError.$(H): HGBookmarkError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGChangeset.$(O) HGChangeset.$(H): HGChangeset.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGChangesetLabel.$(O) HGChangesetLabel.$(H): HGChangesetLabel.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGCommand.$(O) HGCommand.$(H): HGCommand.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGDebugFlags.$(H) $(STCHDR)
-$(OUTDIR)HGCommandError.$(O) HGCommandError.$(H): HGCommandError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGCommandServer.$(O) HGCommandServer.$(H): HGCommandServer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGDebugFlags.$(H) $(STCHDR)
-$(OUTDIR)HGCommitError.$(O) HGCommitError.$(H): HGCommitError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGConfig.$(O) HGConfig.$(H): HGConfig.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGNoSuchBranchError.$(O) HGNoSuchBranchError.$(H): HGNoSuchBranchError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGRemote.$(O) HGRemote.$(H): HGRemote.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGRepository.$(O) HGRepository.$(H): HGRepository.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGRepositoryError.$(O) HGRepositoryError.$(H): HGRepositoryError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGWorkingCopy.$(O) HGWorkingCopy.$(H): HGWorkingCopy.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGBranch.$(O) HGBranch.$(H): HGBranch.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGCommandParseError.$(O) HGCommandParseError.$(H): HGCommandParseError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGCommandError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGInvalidExecutableError.$(O) HGInvalidExecutableError.$(H): HGInvalidExecutableError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGCommandError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGInvalidVersionError.$(O) HGInvalidVersionError.$(H): HGInvalidVersionError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGCommandError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
-$(OUTDIR)HGPushError.$(O) HGPushError.$(H): HGPushError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
-$(OUTDIR)HGTagOrBookmark.$(O) HGTagOrBookmark.$(H): HGTagOrBookmark.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
-$(OUTDIR)HGUnknownRevisionError.$(O) HGUnknownRevisionError.$(H): HGUnknownRevisionError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
-$(OUTDIR)HGBookmark.$(O) HGBookmark.$(H): HGBookmark.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGTagOrBookmark.$(H) $(STCHDR)
-$(OUTDIR)HGPushWouldCreateNewHeadError.$(O) HGPushWouldCreateNewHeadError.$(H): HGPushWouldCreateNewHeadError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGPushError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
-$(OUTDIR)HGTag.$(O) HGTag.$(H): HGTag.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGTagOrBookmark.$(H) $(STCHDR)
+$(OUTDIR)HG2CVS.$(O) HG2CVS.$(C) HG2CVS.$(H): HG2CVS.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGAuthorQuery.$(O) HGAuthorQuery.$(C) HGAuthorQuery.$(H): HGAuthorQuery.st $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(STCHDR)
+$(OUTDIR)HGCachedFileData.$(O) HGCachedFileData.$(C) HGCachedFileData.$(H): HGCachedFileData.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGChange.$(O) HGChange.$(C) HGChange.$(H): HGChange.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetBrowser.$(O) HGChangesetBrowser.$(C) HGChangesetBrowser.$(H): HGChangesetBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetDialog.$(O) HGChangesetDialog.$(C) HGChangesetDialog.$(H): HGChangesetDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetFile.$(O) HGChangesetFile.$(C) HGChangesetFile.$(H): HGChangesetFile.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetId.$(O) HGChangesetId.$(C) HGChangesetId.$(H): HGChangesetId.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetLabelsView.$(O) HGChangesetLabelsView.$(C) HGChangesetLabelsView.$(H): HGChangesetLabelsView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetList.$(O) HGChangesetList.$(C) HGChangesetList.$(H): HGChangesetList.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetPresenter.$(O) HGChangesetPresenter.$(C) HGChangesetPresenter.$(H): HGChangesetPresenter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetViewer.$(O) HGChangesetViewer.$(C) HGChangesetViewer.$(H): HGChangesetViewer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)HGCommandParser.$(O) HGCommandParser.$(C) HGCommandParser.$(H): HGCommandParser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGCommitDialog.$(O) HGCommitDialog.$(C) HGCommitDialog.$(H): HGCommitDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractCommitDialog.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractDialog.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
+$(OUTDIR)HGCommitTask.$(O) HGCommitTask.$(C) HGCommitTask.$(H): HGCommitTask.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractCommitTask.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractFileoutLikeTask.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractTask.$(H) $(STCHDR)
+$(OUTDIR)HGDebugFlags.$(O) HGDebugFlags.$(C) HGDebugFlags.$(H): HGDebugFlags.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(STCHDR)
+$(OUTDIR)HGError.$(O) HGError.$(C) HGError.$(H): HGError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGIconLibrary.$(O) HGIconLibrary.$(C) HGIconLibrary.$(H): HGIconLibrary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGMergeInfo.$(O) HGMergeInfo.$(C) HGMergeInfo.$(H): HGMergeInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGMergeTool.$(O) HGMergeTool.$(C) HGMergeTool.$(H): HGMergeTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGNotification.$(O) HGNotification.$(C) HGNotification.$(H): HGNotification.st $(INCLUDE_TOP)\stx\libbasic\ActivityNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(STCHDR)
+$(OUTDIR)HGPackageRevision.$(O) HGPackageRevision.$(C) HGPackageRevision.$(H): HGPackageRevision.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageRevision.$(H) $(STCHDR)
+$(OUTDIR)HGPackageWorkingCopy.$(O) HGPackageWorkingCopy.$(C) HGPackageWorkingCopy.$(H): HGPackageWorkingCopy.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageModel.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageWorkingCopy.$(H) $(STCHDR)
+$(OUTDIR)HGPackageWorkingCopyRegistry.$(O) HGPackageWorkingCopyRegistry.$(C) HGPackageWorkingCopyRegistry.$(H): HGPackageWorkingCopyRegistry.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractPackageWorkingCopyRegistry.$(H) $(STCHDR)
+$(OUTDIR)HGPushPullInfo.$(O) HGPushPullInfo.$(C) HGPushPullInfo.$(H): HGPushPullInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGRepositoryObject.$(O) HGRepositoryObject.$(C) HGRepositoryObject.$(H): HGRepositoryObject.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGRevisionAnnotation.$(O) HGRevisionAnnotation.$(C) HGRevisionAnnotation.$(H): HGRevisionAnnotation.st $(INCLUDE_TOP)\stx\libbasic\Annotation.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGRevisionInfo.$(O) HGRevisionInfo.$(C) HGRevisionInfo.$(H): HGRevisionInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractRevisionInfo.$(H) $(STCHDR)
+$(OUTDIR)HGRevset.$(O) HGRevset.$(C) HGRevset.$(H): HGRevset.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)HGRevsetEditor.$(O) HGRevsetEditor.$(C) HGRevsetEditor.$(H): HGRevsetEditor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)HGSourceCodeManagementSettingsAppl.$(O) HGSourceCodeManagementSettingsAppl.$(C) HGSourceCodeManagementSettingsAppl.$(H): HGSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)HGSourceCodeManager.$(O) HGSourceCodeManager.$(C) HGSourceCodeManager.$(H): HGSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMAbstractSourceCodeManager.$(H) $(STCHDR)
+$(OUTDIR)HGSourceCodeManagerUtilities.$(O) HGSourceCodeManagerUtilities.$(C) HGSourceCodeManagerUtilities.$(H): HGSourceCodeManagerUtilities.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libscm\common\SCMCommonSourceCodeManagerUtilities.$(H) $(STCHDR)
+$(OUTDIR)HGStatus.$(O) HGStatus.$(C) HGStatus.$(H): HGStatus.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic2\Singleton.$(H) $(STCHDR)
+$(OUTDIR)HGWarning.$(O) HGWarning.$(C) HGWarning.$(H): HGWarning.st $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\Warning.$(H) $(STCHDR)
+$(OUTDIR)HGWorkingCopyFile.$(O) HGWorkingCopyFile.$(C) HGWorkingCopyFile.$(H): HGWorkingCopyFile.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libscm_mercurial.$(O) stx_libscm_mercurial.$(C) stx_libscm_mercurial.$(H): stx_libscm_mercurial.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)HGBookmarkError.$(O) HGBookmarkError.$(C) HGBookmarkError.$(H): HGBookmarkError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGChangeset.$(O) HGChangeset.$(C) HGChangeset.$(H): HGChangeset.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGChangesetLabel.$(O) HGChangesetLabel.$(C) HGChangesetLabel.$(H): HGChangesetLabel.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGCommand.$(O) HGCommand.$(C) HGCommand.$(H): HGCommand.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGDebugFlags.$(H) $(STCHDR)
+$(OUTDIR)HGCommandError.$(O) HGCommandError.$(C) HGCommandError.$(H): HGCommandError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGCommandServer.$(O) HGCommandServer.$(C) HGCommandServer.$(H): HGCommandServer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGDebugFlags.$(H) $(STCHDR)
+$(OUTDIR)HGCommitError.$(O) HGCommitError.$(C) HGCommitError.$(H): HGCommitError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGConfig.$(O) HGConfig.$(C) HGConfig.$(H): HGConfig.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGNoSuchBranchError.$(O) HGNoSuchBranchError.$(C) HGNoSuchBranchError.$(H): HGNoSuchBranchError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGRemote.$(O) HGRemote.$(C) HGRemote.$(H): HGRemote.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGRepository.$(O) HGRepository.$(C) HGRepository.$(H): HGRepository.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGRepositoryError.$(O) HGRepositoryError.$(C) HGRepositoryError.$(H): HGRepositoryError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGWorkingCopy.$(O) HGWorkingCopy.$(C) HGWorkingCopy.$(H): HGWorkingCopy.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGBranch.$(O) HGBranch.$(C) HGBranch.$(H): HGBranch.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGCommandParseError.$(O) HGCommandParseError.$(C) HGCommandParseError.$(H): HGCommandParseError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGCommandError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGInvalidExecutableError.$(O) HGInvalidExecutableError.$(C) HGInvalidExecutableError.$(H): HGInvalidExecutableError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGCommandError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGInvalidVersionError.$(O) HGInvalidVersionError.$(C) HGInvalidVersionError.$(H): HGInvalidVersionError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGCommandError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(STCHDR)
+$(OUTDIR)HGObsoleteRevisionError.$(O) HGObsoleteRevisionError.$(C) HGObsoleteRevisionError.$(H): HGObsoleteRevisionError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGPushError.$(O) HGPushError.$(C) HGPushError.$(H): HGPushError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGTagOrBookmark.$(O) HGTagOrBookmark.$(C) HGTagOrBookmark.$(H): HGTagOrBookmark.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(STCHDR)
+$(OUTDIR)HGUnknownRevisionError.$(O) HGUnknownRevisionError.$(C) HGUnknownRevisionError.$(H): HGUnknownRevisionError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGBookmark.$(O) HGBookmark.$(C) HGBookmark.$(H): HGBookmark.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGTagOrBookmark.$(H) $(STCHDR)
+$(OUTDIR)HGPushWouldCreateNewHeadError.$(O) HGPushWouldCreateNewHeadError.$(C) HGPushWouldCreateNewHeadError.$(H): HGPushWouldCreateNewHeadError.st $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGPushError.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryError.$(H) $(STCHDR)
+$(OUTDIR)HGTag.$(O) HGTag.$(C) HGTag.$(H): HGTag.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGChangesetLabel.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGRepositoryObject.$(H) $(INCLUDE_TOP)\stx\libscm\mercurial\HGTagOrBookmark.$(H) $(STCHDR)
 $(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\Annotation.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileBrowser.$(H) $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line

--- a/mercurial/bmake.bat	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/bmake.bat	Thu Feb 08 09:54:32 2018 +0000
@@ -11,3 +11,5 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 
+
+

--- a/mercurial/libInit.cc	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/libInit.cc	Thu Feb 08 09:54:32 2018 +0000
@@ -16,78 +16,143 @@
 DLL_EXPORT void _libstx_libscm_mercurial_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-void _libstx_libscm_mercurial_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_libscm_mercurial__DFN", _libstx_libscm_mercurial_InitDefinition, "stx:libscm/mercurial");
-_stx_137libscm_137mercurial_Init(pass,__pRT__,snd);
+extern void _HG2CVS_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGAuthorQuery_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCachedFileData_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChange_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetBrowser_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetDialog_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetFile_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetId_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetLabelsView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetList_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetPresenter_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetViewer_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommandParser_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommitDialog_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommitTask_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGDebugFlags_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGIconLibrary_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGMergeInfo_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGMergeTool_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGNotification_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGPackageRevision_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGPackageWorkingCopy_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGPackageWorkingCopyRegistry_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGPushPullInfo_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRepositoryObject_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRevisionAnnotation_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRevisionInfo_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRevset_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRevsetEditor_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGSourceCodeManagementSettingsAppl_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGSourceCodeManager_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGSourceCodeManagerUtilities_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGStatus_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGWarning_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGWorkingCopyFile_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _stx_137libscm_137mercurial_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGBookmarkError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangeset_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGChangesetLabel_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommand_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommandError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommandServer_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommitError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGConfig_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGNoSuchBranchError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRemote_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRepository_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGRepositoryError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGWorkingCopy_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGBranch_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGCommandParseError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGInvalidExecutableError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGInvalidVersionError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGObsoleteRevisionError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGPushError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGTagOrBookmark_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGUnknownRevisionError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGBookmark_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGPushWouldCreateNewHeadError_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _HGTag_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 
-__END_PACKAGE__();
+extern void _stx_137libscm_137mercurial_extensions_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+void _libstx_libscm_mercurial_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libstx_libscm_mercurial__DFN", _libstx_libscm_mercurial_InitDefinition, "stx:libscm/mercurial");
+    _stx_137libscm_137mercurial_Init(pass,__pRT__,snd);
+
+  __END_PACKAGE__();
 }
 
-void _libstx_libscm_mercurial_Init(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_libscm_mercurial", _libstx_libscm_mercurial_Init, "stx:libscm/mercurial");
-_HG2CVS_Init(pass,__pRT__,snd);
-_HGAuthorQuery_Init(pass,__pRT__,snd);
-_HGCachedFileData_Init(pass,__pRT__,snd);
-_HGChange_Init(pass,__pRT__,snd);
-_HGChangesetBrowser_Init(pass,__pRT__,snd);
-_HGChangesetDialog_Init(pass,__pRT__,snd);
-_HGChangesetFile_Init(pass,__pRT__,snd);
-_HGChangesetId_Init(pass,__pRT__,snd);
-_HGChangesetLabelsView_Init(pass,__pRT__,snd);
-_HGChangesetList_Init(pass,__pRT__,snd);
-_HGChangesetPresenter_Init(pass,__pRT__,snd);
-_HGChangesetViewer_Init(pass,__pRT__,snd);
-_HGCommandParser_Init(pass,__pRT__,snd);
-_HGCommitDialog_Init(pass,__pRT__,snd);
-_HGCommitTask_Init(pass,__pRT__,snd);
-_HGDebugFlags_Init(pass,__pRT__,snd);
-_HGError_Init(pass,__pRT__,snd);
-_HGIconLibrary_Init(pass,__pRT__,snd);
-_HGMergeInfo_Init(pass,__pRT__,snd);
-_HGMergeTool_Init(pass,__pRT__,snd);
-_HGNotification_Init(pass,__pRT__,snd);
-_HGPackageRevision_Init(pass,__pRT__,snd);
-_HGPackageWorkingCopy_Init(pass,__pRT__,snd);
-_HGPackageWorkingCopyRegistry_Init(pass,__pRT__,snd);
-_HGPushPullInfo_Init(pass,__pRT__,snd);
-_HGRepositoryObject_Init(pass,__pRT__,snd);
-_HGRevisionAnnotation_Init(pass,__pRT__,snd);
-_HGRevisionInfo_Init(pass,__pRT__,snd);
-_HGRevset_Init(pass,__pRT__,snd);
-_HGRevsetEditor_Init(pass,__pRT__,snd);
-_HGSourceCodeManagementSettingsAppl_Init(pass,__pRT__,snd);
-_HGSourceCodeManager_Init(pass,__pRT__,snd);
-_HGSourceCodeManagerUtilities_Init(pass,__pRT__,snd);
-_HGStatus_Init(pass,__pRT__,snd);
-_HGWarning_Init(pass,__pRT__,snd);
-_HGWorkingCopyFile_Init(pass,__pRT__,snd);
-_stx_137libscm_137mercurial_Init(pass,__pRT__,snd);
-_HGBookmarkError_Init(pass,__pRT__,snd);
-_HGChangeset_Init(pass,__pRT__,snd);
-_HGChangesetLabel_Init(pass,__pRT__,snd);
-_HGCommand_Init(pass,__pRT__,snd);
-_HGCommandError_Init(pass,__pRT__,snd);
-_HGCommandServer_Init(pass,__pRT__,snd);
-_HGCommitError_Init(pass,__pRT__,snd);
-_HGConfig_Init(pass,__pRT__,snd);
-_HGNoSuchBranchError_Init(pass,__pRT__,snd);
-_HGRemote_Init(pass,__pRT__,snd);
-_HGRepository_Init(pass,__pRT__,snd);
-_HGRepositoryError_Init(pass,__pRT__,snd);
-_HGWorkingCopy_Init(pass,__pRT__,snd);
-_HGBranch_Init(pass,__pRT__,snd);
-_HGCommandParseError_Init(pass,__pRT__,snd);
-_HGInvalidExecutableError_Init(pass,__pRT__,snd);
-_HGInvalidVersionError_Init(pass,__pRT__,snd);
-_HGPushError_Init(pass,__pRT__,snd);
-_HGTagOrBookmark_Init(pass,__pRT__,snd);
-_HGUnknownRevisionError_Init(pass,__pRT__,snd);
-_HGBookmark_Init(pass,__pRT__,snd);
-_HGPushWouldCreateNewHeadError_Init(pass,__pRT__,snd);
-_HGTag_Init(pass,__pRT__,snd);
+void _libstx_libscm_mercurial_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libstx_libscm_mercurial", _libstx_libscm_mercurial_Init, "stx:libscm/mercurial");
+    _HG2CVS_Init(pass,__pRT__,snd);
+    _HGAuthorQuery_Init(pass,__pRT__,snd);
+    _HGCachedFileData_Init(pass,__pRT__,snd);
+    _HGChange_Init(pass,__pRT__,snd);
+    _HGChangesetBrowser_Init(pass,__pRT__,snd);
+    _HGChangesetDialog_Init(pass,__pRT__,snd);
+    _HGChangesetFile_Init(pass,__pRT__,snd);
+    _HGChangesetId_Init(pass,__pRT__,snd);
+    _HGChangesetLabelsView_Init(pass,__pRT__,snd);
+    _HGChangesetList_Init(pass,__pRT__,snd);
+    _HGChangesetPresenter_Init(pass,__pRT__,snd);
+    _HGChangesetViewer_Init(pass,__pRT__,snd);
+    _HGCommandParser_Init(pass,__pRT__,snd);
+    _HGCommitDialog_Init(pass,__pRT__,snd);
+    _HGCommitTask_Init(pass,__pRT__,snd);
+    _HGDebugFlags_Init(pass,__pRT__,snd);
+    _HGError_Init(pass,__pRT__,snd);
+    _HGIconLibrary_Init(pass,__pRT__,snd);
+    _HGMergeInfo_Init(pass,__pRT__,snd);
+    _HGMergeTool_Init(pass,__pRT__,snd);
+    _HGNotification_Init(pass,__pRT__,snd);
+    _HGPackageRevision_Init(pass,__pRT__,snd);
+    _HGPackageWorkingCopy_Init(pass,__pRT__,snd);
+    _HGPackageWorkingCopyRegistry_Init(pass,__pRT__,snd);
+    _HGPushPullInfo_Init(pass,__pRT__,snd);
+    _HGRepositoryObject_Init(pass,__pRT__,snd);
+    _HGRevisionAnnotation_Init(pass,__pRT__,snd);
+    _HGRevisionInfo_Init(pass,__pRT__,snd);
+    _HGRevset_Init(pass,__pRT__,snd);
+    _HGRevsetEditor_Init(pass,__pRT__,snd);
+    _HGSourceCodeManagementSettingsAppl_Init(pass,__pRT__,snd);
+    _HGSourceCodeManager_Init(pass,__pRT__,snd);
+    _HGSourceCodeManagerUtilities_Init(pass,__pRT__,snd);
+    _HGStatus_Init(pass,__pRT__,snd);
+    _HGWarning_Init(pass,__pRT__,snd);
+    _HGWorkingCopyFile_Init(pass,__pRT__,snd);
+    _stx_137libscm_137mercurial_Init(pass,__pRT__,snd);
+    _HGBookmarkError_Init(pass,__pRT__,snd);
+    _HGChangeset_Init(pass,__pRT__,snd);
+    _HGChangesetLabel_Init(pass,__pRT__,snd);
+    _HGCommand_Init(pass,__pRT__,snd);
+    _HGCommandError_Init(pass,__pRT__,snd);
+    _HGCommandServer_Init(pass,__pRT__,snd);
+    _HGCommitError_Init(pass,__pRT__,snd);
+    _HGConfig_Init(pass,__pRT__,snd);
+    _HGNoSuchBranchError_Init(pass,__pRT__,snd);
+    _HGRemote_Init(pass,__pRT__,snd);
+    _HGRepository_Init(pass,__pRT__,snd);
+    _HGRepositoryError_Init(pass,__pRT__,snd);
+    _HGWorkingCopy_Init(pass,__pRT__,snd);
+    _HGBranch_Init(pass,__pRT__,snd);
+    _HGCommandParseError_Init(pass,__pRT__,snd);
+    _HGInvalidExecutableError_Init(pass,__pRT__,snd);
+    _HGInvalidVersionError_Init(pass,__pRT__,snd);
+    _HGObsoleteRevisionError_Init(pass,__pRT__,snd);
+    _HGPushError_Init(pass,__pRT__,snd);
+    _HGTagOrBookmark_Init(pass,__pRT__,snd);
+    _HGUnknownRevisionError_Init(pass,__pRT__,snd);
+    _HGBookmark_Init(pass,__pRT__,snd);
+    _HGPushWouldCreateNewHeadError_Init(pass,__pRT__,snd);
+    _HGTag_Init(pass,__pRT__,snd);
 
-_stx_137libscm_137mercurial_extensions_Init(pass,__pRT__,snd);
-__END_PACKAGE__();
+    _stx_137libscm_137mercurial_extensions_Init(pass,__pRT__,snd);
+  __END_PACKAGE__();
 }

--- a/mercurial/mingwmake.bat	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/mingwmake.bat	Thu Feb 08 09:54:32 2018 +0000
@@ -14,3 +14,5 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
+
+

--- a/mercurial/monticello/Make.proto	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/Make.proto	Thu Feb 08 09:54:32 2018 +0000
@@ -101,19 +101,19 @@
 
 # build all mandatory prerequisite packages (containing superclasses) for this package
 prereq:
-	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-	cd ../../../goodies/monticello && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+	cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../goodies/refactoryBrowser/parser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libcompat && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+	cd ../../../goodies/monticello && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
 
 
 
@@ -133,8 +133,8 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)/stx/goodies/monticello/MCAncestry.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCLazyVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCVersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(C) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)/stx/goodies/monticello/MCAncestry.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCLazyVersionInfo.$(H) $(INCLUDE_TOP)/stx/goodies/monticello/MCVersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(C) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 

--- a/mercurial/monticello/Make.spec	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/Make.spec	Thu Feb 08 09:54:32 2018 +0000
@@ -22,7 +22,7 @@
 #                (if removed, they will be created as common
 #  -Pxxx       : defines the package
 #  -Zxxx       : a prefix for variables within the classLib
-#  -Dxxx       : defines passed to to CC for inline C-code
+#  -Dxxx       : defines passed to CC for inline C-code
 #  -Ixxx       : include path passed to CC for inline C-code
 #  +optspace   : optimized for space
 #  +optspace2  : optimized more for space
@@ -58,8 +58,8 @@
 
 
 COMMON_OBJS= \
-    $(OUTDIR_SLASH)HGMCVersionInfo.$(O) \
-    $(OUTDIR_SLASH)stx_libscm_mercurial_monticello.$(O) \
+    $(OUTDIR)HGMCVersionInfo.$(O) \
+    $(OUTDIR)stx_libscm_mercurial_monticello.$(O) \
 
 
 

--- a/mercurial/monticello/bc.mak	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/bc.mak	Thu Feb 08 09:54:32 2018 +0000
@@ -31,7 +31,7 @@
 
 LIBNAME=libstx_libscm_mercurial_monticello
 MODULE_PATH=libscm\mercurial\monticello
-RESFILES=monticello.$(RES)
+RESFILES=stx_libscm_mercurial_monticelloWINrc.$(RES)
 
 
 
@@ -76,12 +76,12 @@
 	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
         
 clean::
-	del *.$(CSUFFIX)
+	-del *.$(CSUFFIX)
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)\stx\goodies\monticello\MCAncestry.$(H) $(INCLUDE_TOP)\stx\goodies\monticello\MCLazyVersionInfo.$(H) $(INCLUDE_TOP)\stx\goodies\monticello\MCVersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
+$(OUTDIR)HGMCVersionInfo.$(O) HGMCVersionInfo.$(C) HGMCVersionInfo.$(H): HGMCVersionInfo.st $(INCLUDE_TOP)\stx\goodies\monticello\MCAncestry.$(H) $(INCLUDE_TOP)\stx\goodies\monticello\MCLazyVersionInfo.$(H) $(INCLUDE_TOP)\stx\goodies\monticello\MCVersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libscm_mercurial_monticello.$(O) stx_libscm_mercurial_monticello.$(C) stx_libscm_mercurial_monticello.$(H): stx_libscm_mercurial_monticello.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 

--- a/mercurial/monticello/bmake.bat	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/bmake.bat	Thu Feb 08 09:54:32 2018 +0000
@@ -11,3 +11,5 @@
 make.exe -N -f bc.mak  %DEFINES% %*
 
 
+
+

--- a/mercurial/monticello/libInit.cc	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/libInit.cc	Thu Feb 08 09:54:32 2018 +0000
@@ -16,20 +16,25 @@
 DLL_EXPORT void _libstx_libscm_mercurial_monticello_InitDefinition() INIT_TEXT_SECTION;
 #endif
 
-void _libstx_libscm_mercurial_monticello_InitDefinition(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_libscm_mercurial_monticello__DFN", _libstx_libscm_mercurial_monticello_InitDefinition, "stx:libscm/mercurial/monticello");
-_stx_137libscm_137mercurial_137monticello_Init(pass,__pRT__,snd);
+extern void _HGMCVersionInfo_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _stx_137libscm_137mercurial_137monticello_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+
+
 
-__END_PACKAGE__();
+void _libstx_libscm_mercurial_monticello_InitDefinition(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libstx_libscm_mercurial_monticello__DFN", _libstx_libscm_mercurial_monticello_InitDefinition, "stx:libscm/mercurial/monticello");
+    _stx_137libscm_137mercurial_137monticello_Init(pass,__pRT__,snd);
+
+  __END_PACKAGE__();
 }
 
-void _libstx_libscm_mercurial_monticello_Init(pass, __pRT__, snd)
-OBJ snd; struct __vmData__ *__pRT__; {
-__BEGIN_PACKAGE2__("libstx_libscm_mercurial_monticello", _libstx_libscm_mercurial_monticello_Init, "stx:libscm/mercurial/monticello");
-_HGMCVersionInfo_Init(pass,__pRT__,snd);
-_stx_137libscm_137mercurial_137monticello_Init(pass,__pRT__,snd);
+void _libstx_libscm_mercurial_monticello_Init(int pass, struct __vmData__ *__pRT__, OBJ snd)
+{
+  __BEGIN_PACKAGE2__("libstx_libscm_mercurial_monticello", _libstx_libscm_mercurial_monticello_Init, "stx:libscm/mercurial/monticello");
+    _HGMCVersionInfo_Init(pass,__pRT__,snd);
+    _stx_137libscm_137mercurial_137monticello_Init(pass,__pRT__,snd);
 
 
-__END_PACKAGE__();
+  __END_PACKAGE__();
 }

--- a/mercurial/monticello/mingwmake.bat	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/mingwmake.bat	Thu Feb 08 09:54:32 2018 +0000
@@ -14,3 +14,5 @@
 make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*
 
 
+
+

--- a/mercurial/monticello/stx_libscm_mercurial_monticello.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/stx_libscm_mercurial_monticello.st	Thu Feb 08 09:54:32 2018 +0000
@@ -1,5 +1,7 @@
 "{ Package: 'stx:libscm/mercurial/monticello' }"
 
+"{ NameSpace: Smalltalk }"
+
 LibraryDefinition subclass:#stx_libscm_mercurial_monticello
 	instanceVariableNames:''
 	classVariableNames:''
@@ -19,32 +21,34 @@
 !
 
 mandatoryPreRequisites
-    "list all required mandatory packages.
-     Packages are mandatory, if they contain superclasses of the package's classes
-     or classes which are extended by this package.
-     This list can be maintained manually or (better) generated and
-     updated by scanning the superclass hierarchies
-     (the browser has a menu function for that)
-     However, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPreRequisites method."
+    "list packages which are mandatory as a prerequisite.
+     This are packages containing superclasses of my classes and classes which
+     are extended by myself.
+     They are mandatory, because we need these packages as a prerequisite for loading and compiling.
+     This method is generated automatically,
+     by searching along the inheritance chain of all of my classes.
+     Please take a look at the #referencedPreRequisites method as well."
 
     ^ #(
-        #'stx:goodies/monticello'    "MCAncestry - superclass of HGMCVersionInfo "
-        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libscm_mercurial_monticello "
+        #'stx:goodies/monticello'    "MCAncestry - superclass of HGMCVersionInfo"
+        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libscm_mercurial_monticello"
     )
 !
 
 referencedPreRequisites
-    "list all packages containing classes referenced by the packages's members.
-     This list can be maintained manually or (better) generated and
-     updated by looking for global variable accesses
-     (the browser has a menu function for that)
-     However, often too much is found, and you may want to explicitely
-     exclude individual packages in the #excludedFromPreRequisites method."
+    "list packages which are a prerequisite, because they contain
+     classes which are referenced by my classes.
+     These packages are NOT needed as a prerequisite for compiling or loading,
+     however, a class from it may be referenced during execution and having it
+     unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
+     includes explicit checks for the package being present.
+     This method is generated automatically,
+     by searching all classes (and their packages) which are referenced by my classes.
+     Please also take a look at the #mandatoryPreRequisites method"
 
     ^ #(
-        #'stx:libbasic2'    "UUID - referenced by HGMCVersionInfo>>initializeWithPackage:changeset: "
-        #'stx:libscm/mercurial'    "HGPackageModel - referenced by HGMCVersionInfo class>>forPackage: "
+        #'stx:libbasic2'    "UUID - referenced by HGMCVersionInfo>>initializeWithPackage:changeset:"
+        #'stx:libscm/mercurial'    "HGChangesetId - referenced by HGMCVersionInfo>>splicedAncestorsFor:"
     )
 !
 
@@ -75,7 +79,9 @@
 
 extensionMethodNames
     "lists the extension methods which are to be included in the project.
-     Entries are 2-element array literals, consisting of class-name and selector."
+     Entries are 2-element array literals, consisting of class-name and selector.
+     A correponding method with real names must be present in my concrete subclasses
+     if it has extensions."
 
     ^ #(
     )

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/monticello/stx_libscm_mercurial_monticelloWINrc.rc	Thu Feb 08 09:54:32 2018 +0000
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_libscm_mercurial_monticello.
+//
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION     6,2,32767,32767
+  PRODUCTVERSION  6,2,6,0
+#if (__BORLANDC__)
+  FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
+  FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+  FILEOS          VOS_NT_WINDOWS32
+  FILETYPE        VFT_DLL
+  FILESUBTYPE     VS_USER_DEFINED
+#endif
+
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "eXept Software AG\0"
+      VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
+      VALUE "InternalName", "stx:libscm/mercurial/monticello\0"
+      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2013\nCopyright eXept Software AG 1998-2013\0"
+      VALUE "ProductName", "Smalltalk/X\0"
+      VALUE "ProductVersion", "6.2.6.0\0"
+      VALUE "ProductDate", "Thu, 08 Feb 2018 09:51:20 GMT\0"
+    END
+
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN                               //  Language   |    Translation
+    VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+  END
+END

--- a/mercurial/monticello/vcmake.bat	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/monticello/vcmake.bat	Thu Feb 08 09:54:32 2018 +0000
@@ -19,3 +19,4 @@
 
 
 
+

--- a/mercurial/stx_libscm_mercurial.st	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/stx_libscm_mercurial.st	Thu Feb 08 09:54:32 2018 +0000
@@ -66,10 +66,10 @@
      are extended by myself.
      They are mandatory, because we need these packages as a prerequisite for loading and compiling.
      This method is generated automatically,
-     by searching along the inheritance chain of all of my classes."
+     by searching along the inheritance chain of all of my classes.
+     Please take a look at the #referencedPreRequisites method as well."
 
     ^ #(
-        #'stx:goodies/sunit'    "TestAsserter - superclass of HGRepositoriesResource"
         #'stx:libbasic'    "ActivityNotification - superclass of HGNotification"
         #'stx:libbasic2'    "Singleton - superclass of HGStatus"
         #'stx:libbasic3'    "AbstractSourceCodeManager - superclass of HGSourceCodeManager"
@@ -104,17 +104,20 @@
 referencedPreRequisites
     "list packages which are a prerequisite, because they contain
      classes which are referenced by my classes.
-     We do not need these packages as a prerequisite for compiling or loading,
+     These packages are NOT needed as a prerequisite for compiling or loading,
      however, a class from it may be referenced during execution and having it
      unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
      includes explicit checks for the package being present.
      This method is generated automatically,
-     by searching all classes (and their packages) which are referenced by my classes."
+     by searching all classes (and their packages) which are referenced by my classes.
+     Please also take a look at the #mandatoryPreRequisites method"
 
     ^ #(
+        #'stx:goodies/sunit'    "TestAsserter - superclass of HGCommandParserTests"
         #'stx:libhtml'    "HTMLDocumentView - referenced by HGSourceCodeManagementSettingsAppl>>help"
         #'stx:libjava'    "Java - referenced by HGStXTests>>test_commit_16a"
         #'stx:libjava/tools'    "JavaCompiler - referenced by HGStXTests>>test_commit_java_01a"
+        #'stx:libtool2'    "Tools::ObjectModuleInformation - referenced by HGSourceCodeManager class>>revisionInfoFromString:"
         #'stx:libwidg'    "DialogBox - referenced by AbstractFileBrowser>>hgClone"
         #'stx:libwidg2'    "ProgressIndicator - referenced by AbstractFileBrowser>>hgClone"
     )
@@ -206,7 +209,6 @@
         HGPackageWorkingCopy
         HGPackageWorkingCopyRegistry
         HGPushPullInfo
-        (HGRepositoriesResource autoload)
         HGRepositoryObject
         HGRevisionAnnotation
         HGRevisionInfo
@@ -216,7 +218,6 @@
         HGSourceCodeManager
         HGSourceCodeManagerUtilities
         HGStatus
-        (HGTestCase autoload)
         HGWarning
         HGWorkingCopyFile
         #'stx_libscm_mercurial'
@@ -232,27 +233,32 @@
         HGRemote
         HGRepository
         HGRepositoryError
-        (HGStXTests autoload)
-        (HGTests autoload)
         HGWorkingCopy
         HGBranch
         HGCommandParseError
         HGInvalidExecutableError
         HGInvalidVersionError
+        HGObsoleteRevisionError
         HGPushError
         HGTagOrBookmark
         HGUnknownRevisionError
         HGBookmark
         HGPushWouldCreateNewHeadError
         HGTag
+        (HGRepositoriesResource autoload)
+        (HGTestCase autoload)
+        (HGStXTests autoload)
+        (HGTests autoload)
         (HGCommandParserTests autoload)
         (HGInstaller autoload)
     )
 !
 
 extensionMethodNames
-    "list class/selector pairs of extensions.
-     A correponding method with real names must be present in my concrete subclasses"
+    "lists the extension methods which are to be included in the project.
+     Entries are 2-element array literals, consisting of class-name and selector.
+     A correponding method with real names must be present in my concrete subclasses
+     if it has extensions."
 
     ^ #(
         ByteArray asHGChangesetId

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/stx_libscm_mercurialWINrc.rc	Thu Feb 08 09:54:32 2018 +0000
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_libscm_mercurial.
+//
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION     6,2,32767,32767
+  PRODUCTVERSION  6,2,6,0
+#if (__BORLANDC__)
+  FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
+  FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+  FILEOS          VOS_NT_WINDOWS32
+  FILETYPE        VFT_DLL
+  FILESUBTYPE     VS_USER_DEFINED
+#endif
+
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "Jan Vrany\0"
+      VALUE "FileDescription", "Mercurial integration for Smalltalk/X (LIB)\0"
+      VALUE "FileVersion", "6.2.32767.32767\0"
+      VALUE "InternalName", "stx:libscm/mercurial\0"
+      VALUE "LegalCopyright", "Copyright Jan Vrany 2012\0"
+      VALUE "ProductName", "Smalltalk/X Mercurial Integration\0"
+      VALUE "ProductVersion", "6.2.6.0\0"
+      VALUE "ProductDate", "Thu, 08 Feb 2018 09:51:19 GMT\0"
+    END
+
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN                               //  Language   |    Translation
+    VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+  END
+END

--- a/mercurial/vcmake.bat	Thu Feb 08 09:09:51 2018 +0000
+++ b/mercurial/vcmake.bat	Thu Feb 08 09:54:32 2018 +0000
@@ -19,3 +19,4 @@
 
 
 
+