Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py
- changeset 174
- 1eb029558431
- parent 55
- b5c84934de9c
- child 216
- 6f9713e8d570
equal
deleted
inserted
replaced
| 173:1c0956b17971 | 174:1eb029558431 |
|---|---|
| 628 self.__SVNUrlDiff) | 628 self.__SVNUrlDiff) |
| 629 self.vcsDirMultiMenuActions.append(act) | 629 self.vcsDirMultiMenuActions.append(act) |
| 630 menu.addSeparator() | 630 menu.addSeparator() |
| 631 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), | 631 act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), |
| 632 self.trUtf8('Revert changes'), self._VCSRevert) | 632 self.trUtf8('Revert changes'), self._VCSRevert) |
| 633 self.vcsDirMenuActions.append(act) | 633 self.vcsDirMultiMenuActions.append(act) |
| 634 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 634 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 635 self.trUtf8('Merge changes'), self._VCSMerge) | 635 self.trUtf8('Merge changes'), self._VCSMerge) |
| 636 self.vcsDirMenuActions.append(act) | 636 self.vcsDirMultiMenuActions.append(act) |
| 637 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 637 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) |
| 638 self.vcsDirMultiMenuActions.append(act) | 638 self.vcsDirMultiMenuActions.append(act) |
| 639 menu.addSeparator() | 639 menu.addSeparator() |
| 640 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) | 640 act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) |
| 641 self.vcsDirMultiMenuActions.append(act) | 641 self.vcsDirMultiMenuActions.append(act) |
