Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
- changeset 4058
- 99ec13e695f9
- parent 4021
- 195a471c327b
- child 4079
- a3319822d303
equal
deleted
inserted
replaced
| 4054:3ef699270e61 | 4058:99ec13e695f9 |
|---|---|
| 516 menu.addSeparator() | 516 menu.addSeparator() |
| 517 | 517 |
| 518 menu.addAction(self.vcsUpdateAct) | 518 menu.addAction(self.vcsUpdateAct) |
| 519 menu.addAction(self.vcsCommitAct) | 519 menu.addAction(self.vcsCommitAct) |
| 520 menu.addSeparator() | 520 menu.addSeparator() |
| 521 menu.addAction(self.vcsNewAct) | |
| 522 menu.addAction(self.vcsExportAct) | |
| 523 menu.addSeparator() | |
| 524 menu.addAction(self.vcsTagAct) | 521 menu.addAction(self.vcsTagAct) |
| 525 if self.vcs.otherData["standardLayout"]: | 522 if self.vcs.otherData["standardLayout"]: |
| 526 menu.addAction(self.svnTagListAct) | 523 menu.addAction(self.svnTagListAct) |
| 527 menu.addAction(self.svnBranchListAct) | 524 menu.addAction(self.svnBranchListAct) |
| 528 else: | 525 else: |
| 557 menu.addAction(self.svnUpgradeAct) | 554 menu.addAction(self.svnUpgradeAct) |
| 558 menu.addSeparator() | 555 menu.addSeparator() |
| 559 menu.addAction(self.vcsPropsAct) | 556 menu.addAction(self.vcsPropsAct) |
| 560 menu.addSeparator() | 557 menu.addSeparator() |
| 561 menu.addAction(self.svnConfigAct) | 558 menu.addAction(self.svnConfigAct) |
| 559 menu.addSeparator() | |
| 560 menu.addAction(self.vcsNewAct) | |
| 561 menu.addAction(self.vcsExportAct) | |
| 562 | 562 |
| 563 def __svnResolve(self): | 563 def __svnResolve(self): |
| 564 """ | 564 """ |
| 565 Private slot used to resolve conflicts of the local project. | 565 Private slot used to resolve conflicts of the local project. |
| 566 """ | 566 """ |
