Mercurial Repositories > eric / changeset

--- 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.

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Apr 03 19:02:33 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu Apr 03 19:21:10 2014 +0200
@@ -2768,6 +2768,8 @@
             if res:
                 dia.exec_()
 
+    # TODO: add support for hg update --clean to revert a failed/aborted merge
+    
     def hgServe(self, name):
         """
         Public method used to serve the project.