Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- changeset 4058
- 99ec13e695f9
- parent 4021
- 195a471c327b
- child 4079
- a3319822d303
equal
deleted
inserted
replaced
| 4054:3ef699270e61 | 4058:99ec13e695f9 |
|---|---|
| 501 menu.addSeparator() | 501 menu.addSeparator() |
| 502 | 502 |
| 503 menu.addAction(self.vcsUpdateAct) | 503 menu.addAction(self.vcsUpdateAct) |
| 504 menu.addAction(self.vcsCommitAct) | 504 menu.addAction(self.vcsCommitAct) |
| 505 menu.addSeparator() | 505 menu.addSeparator() |
| 506 menu.addAction(self.vcsNewAct) | |
| 507 menu.addAction(self.vcsExportAct) | |
| 508 menu.addSeparator() | |
| 509 menu.addAction(self.vcsTagAct) | 506 menu.addAction(self.vcsTagAct) |
| 510 if self.vcs.otherData["standardLayout"]: | 507 if self.vcs.otherData["standardLayout"]: |
| 511 menu.addAction(self.svnTagListAct) | 508 menu.addAction(self.svnTagListAct) |
| 512 menu.addAction(self.svnBranchListAct) | 509 menu.addAction(self.svnBranchListAct) |
| 513 else: | 510 else: |
| 541 menu.addAction(self.svnUpgradeAct) | 538 menu.addAction(self.svnUpgradeAct) |
| 542 menu.addSeparator() | 539 menu.addSeparator() |
| 543 menu.addAction(self.vcsPropsAct) | 540 menu.addAction(self.vcsPropsAct) |
| 544 menu.addSeparator() | 541 menu.addSeparator() |
| 545 menu.addAction(self.svnConfigAct) | 542 menu.addAction(self.svnConfigAct) |
| 543 menu.addSeparator() | |
| 544 menu.addAction(self.vcsNewAct) | |
| 545 menu.addAction(self.vcsExportAct) | |
| 546 | 546 |
| 547 def __svnResolve(self): | 547 def __svnResolve(self): |
| 548 """ | 548 """ |
| 549 Private slot used to resolve conflicts of the local project. | 549 Private slot used to resolve conflicts of the local project. |
| 550 """ | 550 """ |
