Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Fri Dec 22 19:45:17 2023 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py	Sat Dec 23 15:40:23 2023 +0100
@@ -25,12 +25,15 @@
         Constructor
 
         @param mergelist1 list of previously entered URLs/revisions
-            (list of strings)
+        @type list of str
         @param mergelist2 list of previously entered URLs/revisions
-            (list of strings)
-        @param targetlist list of previously entered targets (list of strings)
-        @param force flag indicating a forced merge (boolean)
-        @param parent parent widget (QWidget)
+        @type list of str
+        @param targetlist list of previously entered targets
+        @type list of str
+        @param force flag indicating a forced merge
+        @type bool
+        @param parent parent widget
+        @type QWidget
         """
         super().__init__(parent)
         self.setupUi(self)
@@ -77,7 +80,8 @@
         """
         Private slot to handle the tag1Combo editTextChanged signal.
 
-        @param text text of the combo (string)
+        @param text text of the combo
+        @type str
         """
         self.__enableOkButton()
 
@@ -86,7 +90,8 @@
         """
         Private slot to handle the tag2Combo editTextChanged signal.
 
-        @param text text of the combo (string)
+        @param text text of the combo
+        @type str
         """
         self.__enableOkButton()
 
@@ -95,7 +100,8 @@
         Public method to retrieve the merge data.
 
         @return tuple naming two tag names or two revisions, a target and
-            a flag indicating a forced merge (string, string, string, boolean)
+            a flag indicating a forced merge
+        @rtype tuple of (str, str, str, bool)
         """
         return (
             self.tag1Combo.currentText(),