Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py

changeset 495
b31b0bffa5b0
parent 248
f4561c24989a
child 791
9ec2ac20e54e
equal deleted inserted replaced
492:01f3384d535a 495:b31b0bffa5b0
688 fn = itm.dirName() 688 fn = itm.dirName()
689 isFile = os.path.isfile(fn) 689 isFile = os.path.isfile(fn)
690 movefiles = self.browser.project.getFiles(fn) 690 movefiles = self.browser.project.getFiles(fn)
691 if self.vcs.vcsMove(fn, self.project): 691 if self.vcs.vcsMove(fn, self.project):
692 if isFile: 692 if isFile:
693 self.browser.emit(SIGNAL('closeSourceWindow'), fn) 693 self.browser.closeSourceWindow.emit(fn)
694 else: 694 else:
695 for mf in movefiles: 695 for mf in movefiles:
696 self.browser.emit(SIGNAL('closeSourceWindow'), mf) 696 self.browser.closeSourceWindow.emit(mf)
697 697
698 def __SVNResolve(self): 698 def __SVNResolve(self):
699 """ 699 """
700 Private slot called by the context menu to resolve conflicts of a file. 700 Private slot called by the context menu to resolve conflicts of a file.
701 """ 701 """

eric ide

mercurial