--- a/HistoryManager.st	Tue Jul 05 18:24:51 2011 +0200
+++ b/HistoryManager.st	Tue Jul 05 21:31:45 2011 +0200
@@ -993,7 +993,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.74 2011-06-30 17:09:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.75 2011-07-05 19:31:45 cg Exp $'
 ! !
 
 !HistoryManager::HistoryLine class methodsFor:'filtering'!
@@ -1043,8 +1043,10 @@
             "/ (this only occurs if a method was copied from ClassA to ClassB)
             histLine isCreated ifTrue:[
                 aCollectionOfHistoryLines from:index+1 do:[:anotherHistLine |
-                    (anotherHistLine isCreated and:[anotherHistLine what = histLine what]) 
-                        ifTrue:[skip := true]
+                    (anotherHistLine isCreated 
+                    and:[(anotherHistLine what = histLine what)
+                    and:[anotherHistLine user = histLine user]]) 
+                        ifTrue:[self halt. skip := true]
                 ].
                 skip ifFalse:[
                     "/ create followed by a modification, within the historyManagerModificationLimit:
@@ -1067,7 +1069,7 @@
     "Modified: / 08-09-1995 / 17:20:40 / claus"
     "Modified: / 20-06-2004 / 16:36:00 / masca"
     "Modified: / 01-09-2004 / 20:20:42 / janfrog"
-    "Modified: / 30-06-2011 / 18:32:22 / cg"
+    "Modified: / 05-07-2011 / 21:19:19 / cg"
 !
 
 modificationLimit
@@ -1681,7 +1683,7 @@
 !HistoryManager class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.74 2011-06-30 17:09:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.75 2011-07-05 19:31:45 cg Exp $'
 ! !
 
 HistoryManager initialize!