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