##// END OF EJS Templates
histedit: show correct hash ID at verification error...
FUJIWARA Katsunori -
r27955:b721c954 stable
parent child Browse files
Show More
@@ -1315,12 +1315,12 b' def verifyactions(actions, state, ctxs):'
1315 if _constraints.noother in constraints and ha not in expected:
1315 if _constraints.noother in constraints and ha not in expected:
1316 raise error.ParseError(
1316 raise error.ParseError(
1317 _('%s "%s" changeset was not a candidate')
1317 _('%s "%s" changeset was not a candidate')
1318 % (action.verb, node.short(ha)),
1318 % (action.verb, ha[:12]),
1319 hint=_('only use listed changesets'))
1319 hint=_('only use listed changesets'))
1320 if _constraints.forceother in constraints and ha in expected:
1320 if _constraints.forceother in constraints and ha in expected:
1321 raise error.ParseError(
1321 raise error.ParseError(
1322 _('%s "%s" changeset was not an edited list candidate')
1322 _('%s "%s" changeset was not an edited list candidate')
1323 % (action.verb, node.short(ha)),
1323 % (action.verb, ha[:12]),
1324 hint=_('only use listed changesets'))
1324 hint=_('only use listed changesets'))
1325 if _constraints.noduplicates in constraints and ha in seen:
1325 if _constraints.noduplicates in constraints and ha in seen:
1326 raise error.ParseError(_(
1326 raise error.ParseError(_(
@@ -171,7 +171,7 b' Test that extra revisions are detected'
171 > pick c8e68270e35a 3 four
171 > pick c8e68270e35a 3 four
172 > pick 08d98a8350f3 4 five
172 > pick 08d98a8350f3 4 five
173 > EOF
173 > EOF
174 hg: parse error: pick "363035386362" changeset was not a candidate
174 hg: parse error: pick "6058cbb6cfd7" changeset was not a candidate
175 (only use listed changesets)
175 (only use listed changesets)
176 [255]
176 [255]
177
177
@@ -232,7 +232,7 b' base on a previously picked changeset'
232 > base d273e35dcdf2 B
232 > base d273e35dcdf2 B
233 > pick b2f90fd8aa85 I
233 > pick b2f90fd8aa85 I
234 > EOF
234 > EOF
235 hg: parse error: base "643237336533" changeset was not an edited list candidate
235 hg: parse error: base "d273e35dcdf2" changeset was not an edited list candidate
236 (only use listed changesets)
236 (only use listed changesets)
237
237
238 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
238 $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
@@ -282,7 +282,7 b' try with --rev'
282 > pick de71b079d9ce e
282 > pick de71b079d9ce e
283 > pick 38b92f448761 c
283 > pick 38b92f448761 c
284 > EOF
284 > EOF
285 hg: parse error: pick "646537316230" changeset was not a candidate
285 hg: parse error: pick "de71b079d9ce" changeset was not a candidate
286 (only use listed changesets)
286 (only use listed changesets)
287 $ hg log --graph
287 $ hg log --graph
288 @ changeset: 7:803ef1c6fcfd
288 @ changeset: 7:803ef1c6fcfd
General Comments 0
You need to be logged in to leave comments. Login now