Merged from SVN
authorvrany
Tue, 31 Jul 2012 14:34:33 +0200
changeset 2879 236fd6f1434a
parent 2878 6b43d308b5f7
child 2880 0072cabff85a
Merged from SVN
ChangeSetDiffSet.st
--- a/ChangeSetDiffSet.st	Tue Jul 31 14:34:25 2012 +0200
+++ b/ChangeSetDiffSet.st	Tue Jul 31 14:34:33 2012 +0200
@@ -71,6 +71,12 @@
     ^ self basicNew initialize.
 ! !
 
+!ChangeSetDiffSet class methodsFor:'others'!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.5 2012-07-31 12:34:33 vrany Exp $'
+! !
+
 !ChangeSetDiffSet methodsFor:'accessing'!
 
 diffs
@@ -236,14 +242,30 @@
 
     "Created: / 25-11-2009 / 20:37:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 09-12-2009 / 17:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isForVersionMethod
+    "Returns true, if this is an entry for version method"
+
+    ^diffs allSatisfy:[:each|each isForVersionMethod]
+
+    "Created: / 18-04-2012 / 19:05:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isMerged
+    "raise an error: must be redefined in concrete subclass(es)"
+
+    ^ self diffs allSatisfy:[:e|e isMerged].
+
+    "Created: / 19-03-2012 / 15:15:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !ChangeSetDiffSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.4 2011-11-29 10:26:48 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.5 2012-07-31 12:34:33 vrany Exp $'
 !
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSetDiffSet.st,v 1.4 2011-11-29 10:26:48 cg Exp $'
+version_SVN
+    ^ '§Id: ChangeSetDiffSet.st 1920 2012-04-18 20:21:56Z vranyj1 §'
 ! !