Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- changeset 3037
- a417a0670a36
- parent 3034
- 7ce719013078
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3036:30c81c9e88b8 | 3037:a417a0670a36 |
|---|---|
| 57 self.tag2Combo.currentText() != "" or | 57 self.tag2Combo.currentText() != "" or |
| 58 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and | 58 not ((self.rx_url.exactMatch(self.tag1Combo.currentText()) and |
| 59 self.rx_url.exactMatch(self.tag2Combo.currentText())) or | 59 self.rx_url.exactMatch(self.tag2Combo.currentText())) or |
| 60 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and | 60 (self.rx_rev.exactMatch(self.tag1Combo.currentText()) and |
| 61 self.rx_rev.exactMatch(self.tag2Combo.currentText())) | 61 self.rx_rev.exactMatch(self.tag2Combo.currentText())) |
| 62 ) | 62 ) |
| 63 ) | 63 ) |
| 64 | 64 |
| 65 def on_tag1Combo_editTextChanged(self, text): | 65 def on_tag1Combo_editTextChanged(self, text): |
| 66 """ | 66 """ |
| 67 Private slot to handle the tag1Combo editTextChanged signal. | 67 Private slot to handle the tag1Combo editTextChanged signal. |
| 68 | 68 |
