diff hgext/histedit.py @ 29887:6d66200bff3b

histedit: correct output of error when 'base' is from the edit list This was made more obvious by marmoute's recent rearrangement of this code.
author Augie Fackler <augie@google.com>
date Tue, 30 Aug 2016 13:13:50 -0400
parents 12f8bef59bfa
children 5ad164698626
line wrap: on
line diff
--- a/hgext/histedit.py	Tue Aug 30 13:33:48 2016 -0400
+++ b/hgext/histedit.py	Tue Aug 30 13:13:50 2016 -0400
@@ -789,9 +789,10 @@
     def _verifynodeconstraints(self, prev, expected, seen):
         # base can only be use with a node not in the edited set
         if self.node in expected:
-            msg = _('%s "%s" changeset was not an edited list candidate')
-            raise error.ParseError(msg % (self.verb, node.short(self.node)),
-                                   hint=_('only use listed changesets'))
+            msg = _('%s "%s" changeset was an edited list candidate')
+            raise error.ParseError(
+                msg % (self.verb, node.short(self.node)),
+                hint=_('base must only use unlisted changesets'))
 
 @action(['_multifold'],
         _(