Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- branch
- 5_4_x
- changeset 3338
- 72142b423cad
- parent 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3336:dab3f3978e57 | 3338:72142b423cad |
|---|---|
| 136 | 136 |
| 137 @return tuple naming the revision and a flag indicating a | 137 @return tuple naming the revision and a flag indicating a |
| 138 forced merge (string, boolean) | 138 forced merge (string, boolean) |
| 139 """ | 139 """ |
| 140 if self.numberButton.isChecked(): | 140 if self.numberButton.isChecked(): |
| 141 rev = str(self.numberSpinBox.value()) | 141 rev = "rev({0})".format(self.numberSpinBox.value()) |
| 142 elif self.idButton.isChecked(): | 142 elif self.idButton.isChecked(): |
| 143 rev = self.idEdit.text() | 143 rev = "id({0})".format(self.idEdit.text()) |
| 144 elif self.tagButton.isChecked(): | 144 elif self.tagButton.isChecked(): |
| 145 rev = self.tagCombo.currentText() | 145 rev = self.tagCombo.currentText() |
| 146 elif self.branchButton.isChecked(): | 146 elif self.branchButton.isChecked(): |
| 147 rev = self.branchCombo.currentText() | 147 rev = self.branchCombo.currentText() |
| 148 elif self.bookmarkButton.isChecked(): | 148 elif self.bookmarkButton.isChecked(): |
