Mercurial Mercurial > hg > stx-libbasic3 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cvs rel10.x change
authorClaus Gittinger <cg@exept.de>
Sat, 17 Oct 1998 18:27:04 +0200
changeset 726 b46e6d2ed9a1
parent 725 dc077e26b75c
child 727 1729dca2ab7a
cvs rel10.x change
CVSSCMgr.st file | annotate | diff | comparison | revisions
CVSSourceCodeManager.st file | annotate | diff | comparison | revisions 
--- a/CVSSCMgr.st	Wed Oct 14 14:25:11 1998 +0200
+++ b/CVSSCMgr.st	Sat Oct 17 18:27:04 1998 +0200
@@ -950,6 +950,19 @@
 
     didMerge := false.
 
+    "/
+    "/ cvs above rel10 returns a multiline info ...
+    "/ we have to extract the one line which states what happened.
+    "/
+    whatHappened := whatHappened asCollectionOfLines asStringCollection.
+    whatHappened := whatHappened select:[:line |
+                        (line startsWith:'RCS file') not
+                        and:[(line startsWith:'retrieving') not
+                        and:[(line startsWith:'Merging') not
+                        and:[line size > 0]]]
+                    ].
+    whatHappened := whatHappened asString.
+
     (force or:[whatHappened startsWith:'M ']) ifTrue:[
         "/
         "/ merged in changes
@@ -1315,7 +1328,7 @@
 
     "Created: / 11.9.1996 / 16:16:11 / cg"
     "Modified: / 26.2.1998 / 17:34:16 / stefan"
-    "Modified: / 13.10.1998 / 16:53:40 / cg"
+    "Modified: / 17.10.1998 / 17:25:04 / cg"
 !
 
 streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheIt
@@ -2696,6 +2709,6 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/CVSSCMgr.st,v 1.173 1998-10-14 12:25:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/Attic/CVSSCMgr.st,v 1.174 1998-10-17 16:27:04 cg Exp $'
 ! !
 CVSSourceCodeManager initialize!
--- a/CVSSourceCodeManager.st	Wed Oct 14 14:25:11 1998 +0200
+++ b/CVSSourceCodeManager.st	Sat Oct 17 18:27:04 1998 +0200
@@ -950,6 +950,19 @@
 
     didMerge := false.
 
+    "/
+    "/ cvs above rel10 returns a multiline info ...
+    "/ we have to extract the one line which states what happened.
+    "/
+    whatHappened := whatHappened asCollectionOfLines asStringCollection.
+    whatHappened := whatHappened select:[:line |
+                        (line startsWith:'RCS file') not
+                        and:[(line startsWith:'retrieving') not
+                        and:[(line startsWith:'Merging') not
+                        and:[line size > 0]]]
+                    ].
+    whatHappened := whatHappened asString.
+
     (force or:[whatHappened startsWith:'M ']) ifTrue:[
         "/
         "/ merged in changes
@@ -1315,7 +1328,7 @@
 
     "Created: / 11.9.1996 / 16:16:11 / cg"
     "Modified: / 26.2.1998 / 17:34:16 / stefan"
-    "Modified: / 13.10.1998 / 16:53:40 / cg"
+    "Modified: / 17.10.1998 / 17:25:04 / cg"
 !
 
 streamForClass:cls fileName:fileName revision:revision directory:packageDir module:moduleDir cache:cacheIt
@@ -2696,6 +2709,6 @@
 !CVSSourceCodeManager class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.173 1998-10-14 12:25:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/CVSSourceCodeManager.st,v 1.174 1998-10-17 16:27:04 cg Exp $'
 ! !
 CVSSourceCodeManager initialize!
hg/stx-libbasic3