Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
eric6/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- changeset 8218
- 7c09585bd960
- parent 8143
- 2c730d5fd177
equal
deleted
inserted
replaced
| 8217:385f60c94548 | 8218:7c09585bd960 |
|---|---|
| 29 (list of strings) | 29 (list of strings) |
| 30 @param targetlist list of previously entered targets (list of strings) | 30 @param targetlist list of previously entered targets (list of strings) |
| 31 @param force flag indicating a forced merge (boolean) | 31 @param force flag indicating a forced merge (boolean) |
| 32 @param parent parent widget (QWidget) | 32 @param parent parent widget (QWidget) |
| 33 """ | 33 """ |
| 34 super(SvnMergeDialog, self).__init__(parent) | 34 super().__init__(parent) |
| 35 self.setupUi(self) | 35 self.setupUi(self) |
| 36 | 36 |
| 37 self.forceCheckBox.setChecked(force) | 37 self.forceCheckBox.setChecked(force) |
| 38 | 38 |
| 39 self.rx_url = re.compile('(?:file:|svn:|svn+ssh:|http:|https:)//.+') | 39 self.rx_url = re.compile('(?:file:|svn:|svn+ssh:|http:|https:)//.+') |
