Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 3009
- bf5ae5d7477d
- parent 2963
- 745d38097b7f
- child 3034
- 7ce719013078
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 3008:7848489bcb92 | 3009:bf5ae5d7477d |
|---|---|
| 15 | 15 |
| 16 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): | 16 class SvnMergeDialog(QDialog, Ui_SvnMergeDialog): |
| 17 """ | 17 """ |
| 18 Class implementing a dialog to enter the data for a merge operation. | 18 Class implementing a dialog to enter the data for a merge operation. |
| 19 """ | 19 """ |
| 20 def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None): | 20 def __init__(self, mergelist1, mergelist2, targetlist, force=False, |
| 21 parent=None): | |
| 21 """ | 22 """ |
| 22 Constructor | 23 Constructor |
| 23 | 24 |
| 24 @param mergelist1 list of previously entered URLs/revisions (list of strings) | 25 @param mergelist1 list of previously entered URLs/revisions |
| 25 @param mergelist2 list of previously entered URLs/revisions (list of strings) | 26 (list of strings) |
| 27 @param mergelist2 list of previously entered URLs/revisions | |
| 28 (list of strings) | |
| 26 @param targetlist list of previously entered targets (list of strings) | 29 @param targetlist list of previously entered targets (list of strings) |
| 27 @param force flag indicating a forced merge (boolean) | 30 @param force flag indicating a forced merge (boolean) |
| 28 @param parent parent widget (QWidget) | 31 @param parent parent widget (QWidget) |
| 29 """ | 32 """ |
| 30 super().__init__(parent) | 33 super().__init__(parent) |
