--- a/ChangeSet.st Sun Jul 24 07:14:44 2011 +0200
+++ b/ChangeSet.st Sun Jul 24 08:56:28 2011 +0200
@@ -1055,6 +1055,7 @@
"Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+
!ChangeSet methodsFor:'misc'!
addPatch:nameOfPatch
@@ -1063,19 +1064,6 @@
^ self
! !
-!ChangeSet methodsFor:'private'!
-
-flattenOnto: aCollection
-
- self do:[:change|change flattenOnto: aCollection]
-!
-
-flattenedChanges
- | changes |
- changes := OrderedCollection new.
- self flattenOnto: changes.
- ^changes
-! !
!ChangeSet methodsFor:'private-accessing'!
@@ -1573,24 +1561,6 @@
"Modified: / 12-10-2006 / 16:51:27 / cg"
!
-condenseChangesForRemoved
- "remove all changes which has been removed (marked for removal
- by aChange removed: true)"
-
- |changesToRemove|
-
- changesToRemove := self select:[:aChange |
- aChange isCompositeChange ifTrue:
- [aChange condenseChangesForRemoved].
- aChange removed
- ].
-
- self condenseChanges:changesToRemove
-
- "Created: / 05-11-2001 / 14:21:17 / cg"
- "Modified: / 12-10-2006 / 16:51:27 / cg"
-!
-
diffSetsAgainst:anotherChangeSet
"walk over the receiver and anotherChangeSet,
add all changes to one of the tree lists:
@@ -1912,12 +1882,11 @@
aStream cr.
aStream nextPutAll:(eachChange source).
aStream nextPutLine:'!! !!'.
- aStream cr.
] ifFalse:[
aStream nextPutAll:(eachChange source).
aStream nextPutLine:'!!'.
- aStream cr.
].
+ aStream cr.
].
].
@@ -2938,6 +2907,6 @@
!ChangeSet class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.179 2011-07-06 11:50:29 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.180 2011-07-24 06:56:28 cg Exp $'
! !