Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8358
- 144a6b854f70
- child 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 607 | 607 |
| 608 def __svnResolve(self): | 608 def __svnResolve(self): |
| 609 """ | 609 """ |
| 610 Private slot used to resolve conflicts of the local project. | 610 Private slot used to resolve conflicts of the local project. |
| 611 """ | 611 """ |
| 612 self.vcs.svnResolve(self.project.ppath) | 612 self.vcs.vcsResolved(self.project.ppath) |
| 613 | 613 |
| 614 def __svnPropList(self): | 614 def __svnPropList(self): |
| 615 """ | 615 """ |
| 616 Private slot used to list the properties of the project files. | 616 Private slot used to list the properties of the project files. |
| 617 """ | 617 """ |
