Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8358
- 144a6b854f70
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 590 | 590 |
| 591 def __svnResolve(self): | 591 def __svnResolve(self): |
| 592 """ | 592 """ |
| 593 Private slot used to resolve conflicts of the local project. | 593 Private slot used to resolve conflicts of the local project. |
| 594 """ | 594 """ |
| 595 self.vcs.svnResolve(self.project.ppath) | 595 self.vcs.vcsResolved(self.project.ppath) |
| 596 | 596 |
| 597 def __svnPropList(self): | 597 def __svnPropList(self): |
| 598 """ | 598 """ |
| 599 Private slot used to list the properties of the project files. | 599 Private slot used to list the properties of the project files. |
| 600 """ | 600 """ |
