Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
eric6/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- changeset 7518
- 6dea4abd3097
- parent 7493
- 1696e91a5393
- child 7533
- 88261c96484b
equal
deleted
inserted
replaced
| 7517:d6910340b538 | 7518:6dea4abd3097 |
|---|---|
| 758 fn = itm.fileName() | 758 fn = itm.fileName() |
| 759 except AttributeError: | 759 except AttributeError: |
| 760 fn = itm.dirName() | 760 fn = itm.dirName() |
| 761 isFile = os.path.isfile(fn) | 761 isFile = os.path.isfile(fn) |
| 762 movefiles = self.browser.project.getFiles(fn) | 762 movefiles = self.browser.project.getFiles(fn) |
| 763 self.browser.project.stopFileSystemMonitoring() | |
| 763 if self.vcs.vcsMove(fn, self.project): | 764 if self.vcs.vcsMove(fn, self.project): |
| 764 if isFile: | 765 if isFile: |
| 765 self.browser.closeSourceWindow.emit(fn) | 766 self.browser.closeSourceWindow.emit(fn) |
| 766 else: | 767 else: |
| 767 for mf in movefiles: | 768 for mf in movefiles: |
| 768 self.browser.closeSourceWindow.emit(mf) | 769 self.browser.closeSourceWindow.emit(mf) |
| 769 | 770 self.browser.project.startFileSystemMonitoring() |
| 771 | |
| 770 def __SVNResolve(self): | 772 def __SVNResolve(self): |
| 771 """ | 773 """ |
| 772 Private slot called by the context menu to resolve conflicts of a file. | 774 Private slot called by the context menu to resolve conflicts of a file. |
| 773 """ | 775 """ |
| 774 names = [] | 776 names = [] |
