Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- changeset 495
- b31b0bffa5b0
- parent 216
- 6f9713e8d570
- child 791
- 9ec2ac20e54e
equal
deleted
inserted
replaced
| 492:01f3384d535a | 495:b31b0bffa5b0 |
|---|---|
| 684 fn = itm.dirName() | 684 fn = itm.dirName() |
| 685 isFile = os.path.isfile(fn) | 685 isFile = os.path.isfile(fn) |
| 686 movefiles = self.browser.project.getFiles(fn) | 686 movefiles = self.browser.project.getFiles(fn) |
| 687 if self.vcs.vcsMove(fn, self.project): | 687 if self.vcs.vcsMove(fn, self.project): |
| 688 if isFile: | 688 if isFile: |
| 689 self.browser.emit(SIGNAL('closeSourceWindow'), fn) | 689 self.browser.closeSourceWindow.emit(fn) |
| 690 else: | 690 else: |
| 691 for mf in movefiles: | 691 for mf in movefiles: |
| 692 self.browser.emit(SIGNAL('closeSourceWindow'), mf) | 692 self.browser.closeSourceWindow.emit(mf) |
| 693 | 693 |
| 694 def __SVNResolve(self): | 694 def __SVNResolve(self): |
| 695 """ | 695 """ |
| 696 Private slot called by the context menu to resolve conflicts of a file. | 696 Private slot called by the context menu to resolve conflicts of a file. |
| 697 """ | 697 """ |
