--- versionedFile/versionedFile.py	2006/06/18 12:59:46	1.65
+++ versionedFile/versionedFile.py	2006/10/03 14:40:26	1.67
@@ -860,7 +860,11 @@ class versionedFile(CatalogAware,Folder)
     def diff(self,data):
         """differenz between lastversion and data"""
         d=Differ()
-        tmp=self.getLastVersion().data
+        data=data.rstrip()
+	try:
+	    tmp=self.getLastVersion().data.rstrip()
+	except:
+	    tmp=str(self.getLastVersion().data).rstrip()
         #print "XX",data,tmp
 
 	try:
@@ -873,6 +877,7 @@ class versionedFile(CatalogAware,Folder)
 
         plus=0
         minus=0
+
         for a in l:
             if a[0]=='+':
                 plus+=1