Show More
@@ -1302,12 +1302,14 b' def verifyactions(actions, state, ctxs):' | |||
|
1302 | 1302 | ha = node.hex(nodetoverify) |
|
1303 | 1303 | if _constraints.noother in constraints and ha not in expected: |
|
1304 | 1304 | raise error.ParseError( |
|
1305 |
_(' |
|
|
1306 | 'other than the ones listed') % action.verb) | |
|
1305 | _('%s "%s" changeset was not a candidate') | |
|
1306 | % (action.verb, node.short(ha)), | |
|
1307 | hint=_('only use listed changesets')) | |
|
1307 | 1308 | if _constraints.forceother in constraints and ha in expected: |
|
1308 | 1309 | raise error.ParseError( |
|
1309 |
_(' |
|
|
1310 |
|
|
|
1310 | _('%s "%s" changeset was not an edited list candidate') | |
|
1311 | % (action.verb, node.short(ha)), | |
|
1312 | hint=_('only use listed changesets')) | |
|
1311 | 1313 | if _constraints.noduplicates in constraints and ha in seen: |
|
1312 | 1314 | raise error.ParseError(_( |
|
1313 | 1315 | 'duplicated command for changeset %s') % |
@@ -171,7 +171,8 b' Test that extra revisions are detected' | |||
|
171 | 171 | > pick c8e68270e35a 3 four |
|
172 | 172 | > pick 08d98a8350f3 4 five |
|
173 | 173 | > EOF |
|
174 | hg: parse error: may not use "pick" with changesets other than the ones listed | |
|
174 | hg: parse error: pick "363035386362" changeset was not a candidate | |
|
175 | (only use listed changesets) | |
|
175 | 176 | [255] |
|
176 | 177 | |
|
177 | 178 | Test malformed line |
@@ -232,7 +232,8 b' base on a previously picked changeset' | |||
|
232 | 232 | > base d273e35dcdf2 B |
|
233 | 233 | > pick b2f90fd8aa85 I |
|
234 | 234 | > EOF |
|
235 |
hg: parse error: |
|
|
235 | hg: parse error: base "643237336533" changeset was not an edited list candidate | |
|
236 | (only use listed changesets) | |
|
236 | 237 | |
|
237 | 238 | $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle |
|
238 | 239 | > base cd010b8cd998 A |
@@ -282,7 +282,8 b' try with --rev' | |||
|
282 | 282 | > pick de71b079d9ce e |
|
283 | 283 | > pick 38b92f448761 c |
|
284 | 284 | > EOF |
|
285 | hg: parse error: may not use "pick" with changesets other than the ones listed | |
|
285 | hg: parse error: pick "646537316230" changeset was not a candidate | |
|
286 | (only use listed changesets) | |
|
286 | 287 | $ hg log --graph |
|
287 | 288 | @ changeset: 7:803ef1c6fcfd |
|
288 | 289 | | tag: tip |
General Comments 0
You need to be logged in to leave comments.
Login now