##// END OF EJS Templates
histedit: improve missing rule suggestion...
timeless -
r27217:1ec23f3e default
parent child Browse files
Show More
@@ -1214,7 +1214,7 b' def verifyactions(actions, state, ctxs):'
1214 if missing:
1214 if missing:
1215 raise error.Abort(_('missing rules for changeset %s') %
1215 raise error.Abort(_('missing rules for changeset %s') %
1216 missing[0][:12],
1216 missing[0][:12],
1217 hint=_('do you want to use the drop action?'))
1217 hint=_('use "drop %s" to discard the change') % missing[0][:12])
1218
1218
1219 def newnodestoabort(state):
1219 def newnodestoabort(state):
1220 """process the list of replacements to return
1220 """process the list of replacements to return
@@ -164,7 +164,7 b' Test that missing revisions are detected'
164 > pick 08d98a8350f3 4 five
164 > pick 08d98a8350f3 4 five
165 > EOF
165 > EOF
166 abort: missing rules for changeset c8e68270e35a
166 abort: missing rules for changeset c8e68270e35a
167 (do you want to use the drop action?)
167 (use "drop c8e68270e35a" to discard the change)
168 [255]
168 [255]
169
169
170 Test that extra revisions are detected
170 Test that extra revisions are detected
General Comments 0
You need to be logged in to leave comments. Login now