##// END OF EJS Templates
histedit: report when revisions to edit are not ancestors of working dir...
Simon Heimberg -
r18608:3adbd57e default
parent child Browse files
Show More
@@ -498,8 +498,8 b' def histedit(ui, repo, *parent, **opts):'
498 keep = opts.get('keep', False)
498 keep = opts.get('keep', False)
499 revs = between(repo, parent, topmost, keep)
499 revs = between(repo, parent, topmost, keep)
500 if not revs:
500 if not revs:
501 ui.warn(_('nothing to edit\n'))
501 raise util.Abort(_('%s is not an ancestor of working directory') %
502 return 1
502 node.short(parent))
503
503
504 ctxs = [repo[r] for r in revs]
504 ctxs = [repo[r] for r in revs]
505 rules = opts.get('commands', '')
505 rules = opts.get('commands', '')
@@ -65,5 +65,5 b' Run on a revision not ancestors of the c'
65 $ hg up 2
65 $ hg up 2
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 $ hg histedit -r 4
67 $ hg histedit -r 4
68 nothing to edit
68 abort: 08d98a8350f3 is not an ancestor of working directory
69 [1]
69 [255]
General Comments 0
You need to be logged in to leave comments. Login now