Show More
@@ -789,9 +789,10 b' class base(histeditaction):' | |||||
789 | def _verifynodeconstraints(self, prev, expected, seen): |
|
789 | def _verifynodeconstraints(self, prev, expected, seen): | |
790 | # base can only be use with a node not in the edited set |
|
790 | # base can only be use with a node not in the edited set | |
791 | if self.node in expected: |
|
791 | if self.node in expected: | |
792 |
msg = _('%s "%s" changeset was |
|
792 | msg = _('%s "%s" changeset was an edited list candidate') | |
793 |
raise error.ParseError( |
|
793 | raise error.ParseError( | |
794 | hint=_('only use listed changesets')) |
|
794 | msg % (self.verb, node.short(self.node)), | |
|
795 | hint=_('base must only use unlisted changesets')) | |||
795 |
|
796 | |||
796 | @action(['_multifold'], |
|
797 | @action(['_multifold'], | |
797 | _( |
|
798 | _( |
@@ -235,8 +235,8 b' base on a previously picked changeset' | |||||
235 | > base d273e35dcdf2 B |
|
235 | > base d273e35dcdf2 B | |
236 | > pick b2f90fd8aa85 I |
|
236 | > pick b2f90fd8aa85 I | |
237 | > EOF |
|
237 | > EOF | |
238 |
hg: parse error: base "d273e35dcdf2" changeset was |
|
238 | hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate | |
239 | (only use listed changesets) |
|
239 | (base must only use unlisted changesets) | |
240 |
|
240 | |||
241 | $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle |
|
241 | $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle | |
242 | > base cd010b8cd998 A |
|
242 | > base cd010b8cd998 A |
General Comments 0
You need to be logged in to leave comments.
Login now