Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Mon Sep 20 19:47:18 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Tue Sep 21 19:11:31 2021 +0200
@@ -1122,7 +1122,11 @@
         """
         Public method used to revert changes made to a file/directory.
         
-        @param name file/directory name to be reverted (string)
+        @param name file/directory name to be reverted
+        @type str
+        @return flag indicating, that the update contained an add
+            or delete
+        @rtype bool
         """
         recurse = False
         if not isinstance(name, list):
@@ -1167,6 +1171,20 @@
             dlg.finish()
             dlg.exec()
             self.checkVCSStatus()
+        
+        return False
+    
+    def vcsForget(self, name):
+        """
+        Public method used to remove a file from the repository.
+        
+        Note: svn does not support this operation. The method is implemented
+        as a NoOp.
+        
+        @param name file/directory name to be removed
+        @type str or list of str
+        """
+        pass
     
     def vcsSwitch(self, name):
         """
@@ -1769,7 +1787,7 @@
             url = ""
         return url
 
-    def svnResolve(self, name):
+    def vcsResolved(self, name):
         """
         Public method used to resolve conflicts of a file/directory.
         
@@ -2136,7 +2154,7 @@
         
         return output, error
     
-    def svnSbsDiff(self, name, extended=False, revisions=None):
+    def vcsSbsDiff(self, name, extended=False, revisions=None):
         """
         Public method used to view the difference of a file to the Mercurial
         repository side-by-side.