Show More
@@ -221,6 +221,9 b' def rebase(ui, repo, **opts):' | |||||
221 |
|
221 | |||
222 | if revf: |
|
222 | if revf: | |
223 | rebaseset = scmutil.revrange(repo, revf) |
|
223 | rebaseset = scmutil.revrange(repo, revf) | |
|
224 | if not rebaseset: | |||
|
225 | raise util.Abort(_('empty "rev" revision set - ' | |||
|
226 | 'nothing to rebase')) | |||
224 | elif srcf: |
|
227 | elif srcf: | |
225 | src = scmutil.revrange(repo, [srcf]) |
|
228 | src = scmutil.revrange(repo, [srcf]) | |
226 | rebaseset = repo.revs('(%ld)::', src) |
|
229 | rebaseset = repo.revs('(%ld)::', src) |
@@ -79,6 +79,10 b' These fail:' | |||||
79 | abort: cannot specify both a revision and a base |
|
79 | abort: cannot specify both a revision and a base | |
80 | [255] |
|
80 | [255] | |
81 |
|
81 | |||
|
82 | $ hg rebase --rev '1 & !1' | |||
|
83 | abort: empty "rev" revision set - nothing to rebase | |||
|
84 | [255] | |||
|
85 | ||||
82 | $ hg rebase |
|
86 | $ hg rebase | |
83 | nothing to rebase |
|
87 | nothing to rebase | |
84 | [1] |
|
88 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now