HistoryManager.st
branchjv
changeset 3090 94c427846620
parent 3089 f03ce272ea4e
child 3121 19723298dd2c
child 3125 08d6603c4fe9
--- a/HistoryManager.st	Tue Oct 02 12:23:33 2012 +0100
+++ b/HistoryManager.st	Mon Oct 08 14:01:07 2012 +0100
@@ -1022,7 +1022,7 @@
 !
 
 version
-    ^ '$Id: HistoryManager.st 1972 2012-10-02 11:23:33Z vranyj1 $'
+    ^ '$Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
 ! !
 
 !HistoryManager::HistoryLine class methodsFor:'filtering'!
@@ -1084,7 +1084,7 @@
                         | anotherHistLine |
                         anotherHistLine := aCollectionOfHistoryLines at:index+1.
                         (anotherHistLine isKindOfModified and:[anotherHistLine user = histLine user]) 
-                            ifTrue:[skipNext := true]
+                            ifTrue:[skipNext := (self timeIsShortFrom:histLine to:anotherHistLine)]
                     ].
                 ].
             ].
@@ -1099,6 +1099,7 @@
     "Modified: / 20-06-2004 / 16:36:00 / masca"
     "Modified: / 01-09-2004 / 20:20:42 / janfrog"
     "Modified: / 05-07-2011 / 23:09:01 / cg"
+    "Modified: / 08-10-2012 / 14:59:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 modificationLimit
@@ -1717,11 +1718,11 @@
 !HistoryManager class methodsFor:'documentation'!
 
 version
-    ^ '$Id: HistoryManager.st 1972 2012-10-02 11:23:33Z vranyj1 $'
+    ^ '$Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
 !
 
 version_SVN
-    ^ '$Id: HistoryManager.st 1972 2012-10-02 11:23:33Z vranyj1 $'
+    ^ '$Id: HistoryManager.st 1974 2012-10-08 13:01:07Z vranyj1 $'
 ! !
 
 HistoryManager initialize!