Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py
- changeset 1879
- 194a055fff04
- parent 1509
- c0b5e693b0eb
- child 1880
- dbd4d7698310
equal
deleted
inserted
replaced
| 1878:de889f485ae8 | 1879:194a055fff04 |
|---|---|
| 273 self.trUtf8('Revert changes'), self._VCSRevert) | 273 self.trUtf8('Revert changes'), self._VCSRevert) |
| 274 self.vcsMenuActions.append(act) | 274 self.vcsMenuActions.append(act) |
| 275 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), | 275 act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), |
| 276 self.trUtf8('Merge changes'), self._VCSMerge) | 276 self.trUtf8('Merge changes'), self._VCSMerge) |
| 277 self.vcsMenuActions.append(act) | 277 self.vcsMenuActions.append(act) |
| 278 # TODO: rename to "Conflict resolved (and subsequent occurrances)" | |
| 278 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) | 279 act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) |
| 279 self.vcsMenuActions.append(act) | 280 self.vcsMenuActions.append(act) |
| 280 menu.addSeparator() | 281 menu.addSeparator() |
| 281 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), | 282 act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), |
| 282 self.trUtf8('Lock'), self.__SVNLock) | 283 self.trUtf8('Lock'), self.__SVNLock) |
