Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py
- changeset 3337
- 49faa820151a
- parent 3306
- 0a4e5082cbc6
- child 3366
- 6084bb3c3911
equal
deleted
inserted
replaced
| 3334:a75328ebac64 | 3337:49faa820151a |
|---|---|
| 134 | 134 |
| 135 @return tuple naming the revision and a flag indicating a | 135 @return tuple naming the revision and a flag indicating a |
| 136 forced merge (string, boolean) | 136 forced merge (string, boolean) |
| 137 """ | 137 """ |
| 138 if self.numberButton.isChecked(): | 138 if self.numberButton.isChecked(): |
| 139 rev = str(self.numberSpinBox.value()) | 139 rev = "rev({0})".format(self.numberSpinBox.value()) |
| 140 elif self.idButton.isChecked(): | 140 elif self.idButton.isChecked(): |
| 141 rev = self.idEdit.text() | 141 rev = "id({0})".format(self.idEdit.text()) |
| 142 elif self.tagButton.isChecked(): | 142 elif self.tagButton.isChecked(): |
| 143 rev = self.tagCombo.currentText() | 143 rev = self.tagCombo.currentText() |
| 144 elif self.branchButton.isChecked(): | 144 elif self.branchButton.isChecked(): |
| 145 rev = self.branchCombo.currentText() | 145 rev = self.branchCombo.currentText() |
| 146 elif self.bookmarkButton.isChecked(): | 146 elif self.bookmarkButton.isChecked(): |
