##// END OF EJS Templates
rebase: don't abort if we're asked to rebase an empty revset...
Julien Cristau -
r21197:cb4223c6 stable
parent child Browse files
Show More
@@ -222,8 +222,9 b' def rebase(ui, repo, **opts):'
222 if revf:
222 if revf:
223 rebaseset = scmutil.revrange(repo, revf)
223 rebaseset = scmutil.revrange(repo, revf)
224 if not rebaseset:
224 if not rebaseset:
225 raise util.Abort(_('empty "rev" revision set - '
225 ui.status(_('empty "rev" revision set - '
226 'nothing to rebase'))
226 'nothing to rebase\n'))
227 return 1
227 elif srcf:
228 elif srcf:
228 src = scmutil.revrange(repo, [srcf])
229 src = scmutil.revrange(repo, [srcf])
229 if not src:
230 if not src:
@@ -80,8 +80,8 b' These fail:'
80 [255]
80 [255]
81
81
82 $ hg rebase --rev '1 & !1'
82 $ hg rebase --rev '1 & !1'
83 abort: empty "rev" revision set - nothing to rebase
83 empty "rev" revision set - nothing to rebase
84 [255]
84 [1]
85
85
86 $ hg rebase --source '1 & !1'
86 $ hg rebase --source '1 & !1'
87 abort: empty "source" revision set - nothing to rebase
87 abort: empty "source" revision set - nothing to rebase
General Comments 0
You need to be logged in to leave comments. Login now