diff --git a/hgext/histedit.py b/hgext/histedit.py index e2c086f147efa7f4a07e2d89fe46cf685892ce0b_aGdleHQvaGlzdGVkaXQucHk=..6d66200bff3bf14a996c2908d691b96ab6b14f02_aGdleHQvaGlzdGVkaXQucHk= 100644 --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -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'], _( diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t index e2c086f147efa7f4a07e2d89fe46cf685892ce0b_dGVzdHMvdGVzdC1oaXN0ZWRpdC1iYXNlLnQ=..6d66200bff3bf14a996c2908d691b96ab6b14f02_dGVzdHMvdGVzdC1oaXN0ZWRpdC1iYXNlLnQ= 100644 --- a/tests/test-histedit-base.t +++ b/tests/test-histedit-base.t @@ -235,8 +235,8 @@ > base d273e35dcdf2 B > pick b2f90fd8aa85 I > EOF - hg: parse error: base "d273e35dcdf2" changeset was not an edited list candidate - (only use listed changesets) + hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate + (base must only use unlisted changesets) $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle > base cd010b8cd998 A