--- a/HistoryManager.st	Tue Jul 31 14:28:44 2012 +0200
+++ b/HistoryManager.st	Tue Jul 31 14:31:47 2012 +0200
@@ -366,6 +366,12 @@
     "Modified: 30.4.1996 / 10:57:35 / cg"
 ! !
 
+!HistoryManager class methodsFor:'others'!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.83 2012-07-31 12:31:47 vrany Exp $'
+! !
+
 !HistoryManager methodsFor:'accessing'!
 
 fullHistoryUpdate
@@ -812,7 +818,16 @@
     ].
 
     "add the actual user's historyLine."
-    histLines := (previousHistories ? histories).
+
+    "JV@2012-04-03: Add previous histories if we are updating
+     existing method (avoids having bogus entries when taking
+     existing method as template and then accepting with a different
+     selector and/or in a different class"
+    what == #creation ifTrue:[
+        histLines := OrderedCollection new.
+    ] ifFalse:[
+        histLines := (previousHistories ? histories).
+    ].
     histLines add:newLine.
 
     doFilter ifTrue:[
@@ -833,6 +848,8 @@
     ^ wStream contents.
 
     "Modified: / 30-06-2011 / 17:07:18 / cg"
+    "Modified: / 03-04-2012 / 16:35:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (comment): / 31-07-2012 / 13:31:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 addHistory:what with:arg toHistoryMethodOf:aClass
@@ -1003,7 +1020,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.82 2011-12-04 14:45:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.83 2012-07-31 12:31:47 vrany Exp $'
 ! !
 
 !HistoryManager::HistoryLine class methodsFor:'filtering'!
@@ -1697,8 +1714,8 @@
 
 !HistoryManager class methodsFor:'documentation'!
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/HistoryManager.st,v 1.82 2011-12-04 14:45:34 cg Exp $'
+version_SVN
+    ^ '§Id: HistoryManager.st 1911 2012-04-03 17:14:36Z vranyj1 §'
 ! !
 
 HistoryManager initialize!