Show More
@@ -1315,12 +1315,12 b' def verifyactions(actions, state, ctxs):' | |||
|
1315 | 1315 | if _constraints.noother in constraints and ha not in expected: |
|
1316 | 1316 | raise error.ParseError( |
|
1317 | 1317 | _('%s "%s" changeset was not a candidate') |
|
1318 |
% (action.verb, |
|
|
1318 | % (action.verb, ha[:12]), | |
|
1319 | 1319 | hint=_('only use listed changesets')) |
|
1320 | 1320 | if _constraints.forceother in constraints and ha in expected: |
|
1321 | 1321 | raise error.ParseError( |
|
1322 | 1322 | _('%s "%s" changeset was not an edited list candidate') |
|
1323 |
% (action.verb, |
|
|
1323 | % (action.verb, ha[:12]), | |
|
1324 | 1324 | hint=_('only use listed changesets')) |
|
1325 | 1325 | if _constraints.noduplicates in constraints and ha in seen: |
|
1326 | 1326 | raise error.ParseError(_( |
@@ -171,7 +171,7 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: pick " |
|
|
174 | hg: parse error: pick "6058cbb6cfd7" changeset was not a candidate | |
|
175 | 175 | (only use listed changesets) |
|
176 | 176 | [255] |
|
177 | 177 |
@@ -232,7 +232,7 b' base on a previously picked changeset' | |||
|
232 | 232 | > base d273e35dcdf2 B |
|
233 | 233 | > pick b2f90fd8aa85 I |
|
234 | 234 | > EOF |
|
235 |
hg: parse error: base " |
|
|
235 | hg: parse error: base "d273e35dcdf2" changeset was not an edited list candidate | |
|
236 | 236 | (only use listed changesets) |
|
237 | 237 | |
|
238 | 238 | $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle |
@@ -282,7 +282,7 b' try with --rev' | |||
|
282 | 282 | > pick de71b079d9ce e |
|
283 | 283 | > pick 38b92f448761 c |
|
284 | 284 | > EOF |
|
285 |
hg: parse error: pick " |
|
|
285 | hg: parse error: pick "de71b079d9ce" changeset was not a candidate | |
|
286 | 286 | (only use listed changesets) |
|
287 | 287 | $ hg log --graph |
|
288 | 288 | @ changeset: 7:803ef1c6fcfd |
General Comments 0
You need to be logged in to leave comments.
Login now