diff -r 1b59c4ba121e -r 8cd4d08fa9f6 Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Fri Mar 11 08:55:14 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Fri Mar 11 16:51:57 2011 +0100 @@ -11,11 +11,12 @@ from .Ui_HgRevisionSelectionDialog import Ui_HgRevisionSelectionDialog + class HgRevisionSelectionDialog(QDialog, Ui_HgRevisionSelectionDialog): """ Class implementing a dialog to select a revision. """ - def __init__(self, tagsList, branchesList, showNone = False, parent = None): + def __init__(self, tagsList, branchesList, showNone=False, parent=None): """ Constructor @@ -39,7 +40,7 @@ """ Public method to retrieve the selected revision. - @return tuple naming the revision and a flag indicating a + @return tuple naming the revision and a flag indicating a forced merge (string, boolean) """ if self.numberButton.isChecked():