Merge jv
authorMerge Script
Tue, 09 Aug 2016 06:39:39 +0200
branchjv
changeset 1179 a3c51fbc33cf
parent 1168 07633e05c812 (current diff)
parent 1178 3a6dad9479fd (diff)
child 1182 38600a7a9203
Merge
--- a/.hgtags	Tue Jun 28 08:04:18 2016 +0100
+++ b/.hgtags	Tue Aug 09 06:39:39 2016 +0200
@@ -6,6 +6,10 @@
 2a5f05aac8bd19f21c66dc723f8b4785ab213788 rel5_4_6
 36bfb784fd072274eb02e5649f37c70989b0de12 expecco_1_8_0rc1
 50362b43d10b22d079b89dc9e2a50333c9c14389 initialR
+673d248bdf7c2e2e70cc0fb18243bd085f8ea07c expecco_2_9_0
+673d248bdf7c2e2e70cc0fb18243bd085f8ea07c expecco_2_9_0_a
+673d248bdf7c2e2e70cc0fb18243bd085f8ea07c expecco_2_9_0_win75_lx36
+673d248bdf7c2e2e70cc0fb18243bd085f8ea07c expecco_2_9_1
 78a7cdc9219c0cf53889a82e2633edef6952acab expeccoNET_1_5_0rc1
 78a7cdc9219c0cf53889a82e2633edef6952acab expeccoNET_1_5_1rc1
 78a7cdc9219c0cf53889a82e2633edef6952acab expecco_1_8_2rc1
--- a/SVN__Branch.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__Branch.st	Tue Aug 09 06:39:39 2016 +0200
@@ -529,7 +529,7 @@
 !Branch methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     super printOn:aStream.
     aStream nextPut:$(.
@@ -570,5 +570,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__Branch.st 363 2011-08-08 13:49:48Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__Configuration.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__Configuration.st	Tue Aug 09 06:39:39 2016 +0200
@@ -332,7 +332,7 @@
 !Configuration methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     super printOn:aStream.
     aStream nextPut:$(.
@@ -453,7 +453,7 @@
 !Configuration::Repository methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     super printOn:aStream.
     aStream space.
@@ -496,5 +496,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__Configuration.st 363 2011-08-08 13:49:48Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__PackagePattern.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__PackagePattern.st	Tue Aug 09 06:39:39 2016 +0200
@@ -123,7 +123,7 @@
 !PackagePattern methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     pattern printOn:aStream.
 
@@ -203,5 +203,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__PackagePattern.st 362 2011-08-08 13:07:42Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__Repository.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__Repository.st	Tue Aug 09 06:39:39 2016 +0200
@@ -407,10 +407,10 @@
 !Repository methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     super printOn:aStream.
-    aStream 
+    aStream
         nextPut:$(;
         nextPutAll: url;
         nextPut:$).
@@ -502,5 +502,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__Repository.st 371 2011-09-28 18:47:07Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__RepositoryConfiguration.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__RepositoryConfiguration.st	Tue Aug 09 06:39:39 2016 +0200
@@ -28,10 +28,10 @@
 "{ NameSpace: SVN }"
 
 Object subclass:#RepositoryConfiguration
-        instanceVariableNames:'package url'
-        classVariableNames:''
-        poolDictionaries:''
-        category:'SVN-Core'
+	instanceVariableNames:'package url'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'SVN-Core'
 !
 
 !RepositoryConfiguration class methodsFor:'documentation'!
@@ -185,7 +185,7 @@
 !RepositoryConfiguration methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     self class storeOn:aStream.
     aStream space.
@@ -223,6 +223,7 @@
 
 version_SVN
 
-    ^ '§Id: SVN__RepositoryConfiguration.st 350 2011-07-07 18:42:56Z vranyj1 §'
+    ^ '$Id$'
 
 ! !
+
--- a/SVN__RevisionDate.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__RevisionDate.st	Tue Aug 09 06:39:39 2016 +0200
@@ -88,9 +88,9 @@
 !RevisionDate methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
-    aStream 
+    aStream
         nextPut:${;
         nextPutAll:date printString;
         nextPut:$}
@@ -106,5 +106,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__RevisionDate.st 363 2011-08-08 13:49:48Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__RevisionHead.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__RevisionHead.st	Tue Aug 09 06:39:39 2016 +0200
@@ -74,7 +74,7 @@
 !RevisionHead methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     aStream nextPutAll:'HEAD'
 
@@ -88,5 +88,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__RevisionHead.st 363 2011-08-08 13:49:48Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__RevisionNumber.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__RevisionNumber.st	Tue Aug 09 06:39:39 2016 +0200
@@ -88,7 +88,7 @@
 !RevisionNumber methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     number printOn: aStream
 
@@ -102,5 +102,6 @@
 !
 
 version_SVN
-    ^ '§Id: SVN__RevisionNumber.st 363 2011-08-08 13:49:48Z vranyj1 §'
+    ^ '$Id$'
 ! !
+
--- a/SVN__RevisionRange.st	Tue Jun 28 08:04:18 2016 +0100
+++ b/SVN__RevisionRange.st	Tue Aug 09 06:39:39 2016 +0200
@@ -87,7 +87,7 @@
 !RevisionRange methodsFor:'printing & storing'!
 
 printOn:aStream
-    "append a printed representation if the receiver to the argument, aStream"
+    "append a printed representation of the receiver to the argument, aStream"
 
     start printOn: aStream.
     aStream nextPut:$:.
@@ -106,3 +106,4 @@
 version_CVS
     ^ '$Header$'
 ! !
+