Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 05 May 2016 09:10:46 +0200
branchjv
changeset 4024 aeb721b75bb8
parent 4023 cc7c7a78a57f (current diff)
parent 4021 43053b6b0786 (diff)
child 4028 a9778347c48e
Merge
Change.st
ChangeSetDiff.st
ChangeSetDiffComponent.st
ChangeSetDiffEntry.st
ChangeSetDiffSet.st
ClassCommentChange.st
HistoryManager.st
stx_libbasic3.st
--- a/Change.st	Wed May 04 10:52:10 2016 +0200
+++ b/Change.st	Thu May 05 09:10:46 2016 +0200
@@ -48,12 +48,6 @@
 "
 ! !
 
-!Change class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.68 2014-03-26 17:46:13 vrany Exp $'
-! !
-
 !Change class methodsFor:'support'!
 
 isSource:source1Arg sameSourceAs:source2Arg
@@ -574,15 +568,19 @@
 !Change class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/Change.st,v 1.68 2014-03-26 17:46:13 vrany Exp $'
+    ^ '$Header$'
 !
 
+version_CVS
+    ^ '$Header$'
+!
+    
 version_HG
 
     ^ '$Changeset: <not expanded> $'
 !
 
 version_SVN
-    ^ '$Id: Change.st,v 1.68 2014-03-26 17:46:13 vrany Exp $'
+    ^ '$Id$'
 ! !
 
--- a/ChangeSetDiff.st	Wed May 04 10:52:10 2016 +0200
+++ b/ChangeSetDiff.st	Thu May 05 09:10:46 2016 +0200
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libbasic3' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#ChangeSetDiff
 	instanceVariableNames:'diffset same'
 	classVariableNames:''
@@ -71,12 +73,6 @@
     ^ self basicNew initialize.
 ! !
 
-!ChangeSetDiff class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiff.st,v 1.6 2014-12-29 15:14:33 cg Exp $'
-! !
-
 !ChangeSetDiff class methodsFor:'utilities'!
 
 versionA:changesetA versionB:changesetB 
@@ -213,7 +209,11 @@
 
 !ChangeSetDiff class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_SVN
-    ^ '$Id: ChangeSetDiff.st,v 1.6 2014-12-29 15:14:33 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/ChangeSetDiffComponent.st	Wed May 04 10:52:10 2016 +0200
+++ b/ChangeSetDiffComponent.st	Thu May 05 09:10:46 2016 +0200
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libbasic3' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#ChangeSetDiffComponent
 	instanceVariableNames:'parent'
 	classVariableNames:''
@@ -65,12 +67,6 @@
 "
 ! !
 
-!ChangeSetDiffComponent class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffComponent.st,v 1.5 2014-02-05 17:52:14 cg Exp $'
-! !
-
 !ChangeSetDiffComponent methodsFor:'accessing'!
 
 changesetA
@@ -287,7 +283,11 @@
 
 !ChangeSetDiffComponent class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_SVN
-    ^ '$Id: ChangeSetDiffComponent.st,v 1.5 2014-02-05 17:52:14 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/ChangeSetDiffEntry.st	Wed May 04 10:52:10 2016 +0200
+++ b/ChangeSetDiffEntry.st	Thu May 05 09:10:46 2016 +0200
@@ -108,12 +108,6 @@
     "Modified: / 31-08-2011 / 10:51:34 / cg"
 ! !
 
-!ChangeSetDiffEntry class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
-! !
-
 !ChangeSetDiffEntry methodsFor:'accessing'!
 
 changeClass
@@ -426,7 +420,11 @@
     ^ '$Changeset: <not expanded> $'
 !
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_SVN
-    ^ '$Id: ChangeSetDiffEntry.st,v 1.5 2014-02-05 17:52:37 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/ChangeSetDiffSet.st	Wed May 04 10:52:10 2016 +0200
+++ b/ChangeSetDiffSet.st	Thu May 05 09:10:46 2016 +0200
@@ -26,6 +26,8 @@
 "
 "{ Package: 'stx:libbasic3' }"
 
+"{ NameSpace: Smalltalk }"
+
 ChangeSetDiffComponent subclass:#ChangeSetDiffSet
 	instanceVariableNames:'name versionALabel versionBLabel versionBaseLabel diffs'
 	classVariableNames:''
@@ -71,12 +73,6 @@
     ^ self basicNew initialize.
 ! !
 
-!ChangeSetDiffSet class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.7 2014-02-05 17:52:25 cg Exp $'
-! !
-
 !ChangeSetDiffSet methodsFor:'accessing'!
 
 depth
@@ -337,10 +333,14 @@
 !ChangeSetDiffSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.7 2014-02-05 17:52:25 cg Exp $'
+    ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: ChangeSetDiffSet.st,v 1.7 2014-02-05 17:52:25 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/ClassCommentChange.st	Wed May 04 10:52:10 2016 +0200
+++ b/ClassCommentChange.st	Thu May 05 09:10:46 2016 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic3' }"
 
+"{ NameSpace: Smalltalk }"
+
 ClassChange subclass:#ClassCommentChange
 	instanceVariableNames:'comment'
 	classVariableNames:''
@@ -44,12 +46,6 @@
 "
 ! !
 
-!ClassCommentChange class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassCommentChange.st,v 1.36 2014-02-19 13:05:27 cg Exp $'
-! !
-
 !ClassCommentChange methodsFor:'accessing'!
 
 className:clsName comment:aCommentString
@@ -161,6 +157,10 @@
 !ClassCommentChange class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ClassCommentChange.st,v 1.36 2014-02-19 13:05:27 cg Exp $'
+    ^ '$Header$'
+!
+
+version_CVS
+    ^ '$Header$'
 ! !
 
--- a/HistoryManager.st	Wed May 04 10:52:10 2016 +0200
+++ b/HistoryManager.st	Thu May 05 09:10:46 2016 +0200
@@ -368,12 +368,6 @@
     "Modified: 30.4.1996 / 10:57:35 / cg"
 ! !
 
-!HistoryManager class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.85 2015-02-19 20:39:26 cg Exp $'
-! !
-
 !HistoryManager methodsFor:'accessing'!
 
 fullHistoryUpdate
@@ -1024,7 +1018,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.85 2015-02-19 20:39:26 cg Exp $'
+    ^ '$Header$'
 ! !
 
 !HistoryManager::HistoryLine class methodsFor:'filtering'!
@@ -1719,8 +1713,12 @@
 
 !HistoryManager class methodsFor:'documentation'!
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_SVN
-    ^ '$Id: HistoryManager.st,v 1.85 2015-02-19 20:39:26 cg Exp $'
+    ^ '$Id$'
 ! !
 
 
--- a/stx_libbasic3.st	Wed May 04 10:52:10 2016 +0200
+++ b/stx_libbasic3.st	Thu May 05 09:10:46 2016 +0200
@@ -287,18 +287,16 @@
     ^ "$SVN-Revision:"'Nicht versioniertes Verzeichnis'"$"
 ! !
 
-!stx_libbasic3 class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header$'
-! !
-
 !stx_libbasic3 class methodsFor:'documentation'!
 
 version
     ^ '$Header$'
 !
 
+version_CVS
+    ^ '$Header$'
+!
+
 version_HG
     ^ '$Changeset: <not expanded> $'
 !