diff -r 533226ce6c1e -r 852dc7d65ff0 Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Apr 03 19:02:33 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Apr 03 19:21:10 2014 +0200
@@ -848,6 +848,8 @@
self.hgRollbackAct.triggered.connect(self.__hgRollback)
self.actions.append(self.hgRollbackAct)
+ # TODO: add support for hg update --clean to revert a failed/aborted merge
+
self.hgServeAct = E5Action(
self.tr('Serve project repository'),
self.tr('Serve project repository...'),
@@ -1023,6 +1025,7 @@
adminMenu.addSeparator()
adminMenu.addAction(self.hgRecoverAct)
adminMenu.addSeparator()
+ # TODO: add support for hg update --clean to revert a failed/aborted merge
adminMenu.addAction(self.hgBackoutAct)
adminMenu.addAction(self.hgRollbackAct)
adminMenu.addSeparator()
@@ -1426,6 +1429,8 @@
"""
self.vcs.hgRollback(self.project.ppath)
+ # TODO: add support for hg update --clean to revert a failed/aborted merge
+
def __hgServe(self):
"""
Private slot used to serve the project.
