diff -r de889f485ae8 -r 194a055fff04 Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon May 28 15:59:36 2012 +0200
@@ -219,6 +219,7 @@
self.vcsExportAct.triggered[()].connect(self._vcsExport)
self.actions.append(self.vcsExportAct)
+ # TODO: remove this action from the menu
self.vcsAddAct = E5Action(self.trUtf8('Add to repository'),
UI.PixmapCache.getIcon("vcsAdd.png"),
self.trUtf8('&Add to repository...'), 0, 0, self, 'mercurial_add')
@@ -385,7 +386,8 @@
))
self.vcsMergeAct.triggered[()].connect(self._vcsMerge)
self.actions.append(self.vcsMergeAct)
-
+
+ # TODO: rename to "Conflicts resolved"
self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'),
self.trUtf8('Resolve con&flicts'),
0, 0, self, 'mercurial_resolve')
