Show More
@@ -228,15 +228,17 b' def rebase(ui, repo, **opts):' | |||||
228 | elif srcf: |
|
228 | elif srcf: | |
229 | src = scmutil.revrange(repo, [srcf]) |
|
229 | src = scmutil.revrange(repo, [srcf]) | |
230 | if not src: |
|
230 | if not src: | |
231 |
|
|
231 | ui.status(_('empty "source" revision set - ' | |
232 |
|
|
232 | 'nothing to rebase\n')) | |
|
233 | return 1 | |||
233 | rebaseset = repo.revs('(%ld)::', src) |
|
234 | rebaseset = repo.revs('(%ld)::', src) | |
234 | assert rebaseset |
|
235 | assert rebaseset | |
235 | else: |
|
236 | else: | |
236 | base = scmutil.revrange(repo, [basef or '.']) |
|
237 | base = scmutil.revrange(repo, [basef or '.']) | |
237 | if not base: |
|
238 | if not base: | |
238 |
|
|
239 | ui.status(_('empty "base" revision set - ' | |
239 |
|
|
240 | "can't compute rebase set\n")) | |
|
241 | return 1 | |||
240 | rebaseset = repo.revs( |
|
242 | rebaseset = repo.revs( | |
241 | '(children(ancestor(%ld, %d)) and ::(%ld))::', |
|
243 | '(children(ancestor(%ld, %d)) and ::(%ld))::', | |
242 | base, dest, base) |
|
244 | base, dest, base) |
@@ -84,12 +84,12 b' These fail:' | |||||
84 | [1] |
|
84 | [1] | |
85 |
|
85 | |||
86 | $ hg rebase --source '1 & !1' |
|
86 | $ hg rebase --source '1 & !1' | |
87 |
|
|
87 | empty "source" revision set - nothing to rebase | |
88 |
[ |
|
88 | [1] | |
89 |
|
89 | |||
90 | $ hg rebase --base '1 & !1' |
|
90 | $ hg rebase --base '1 & !1' | |
91 |
|
|
91 | empty "base" revision set - can't compute rebase set | |
92 |
[ |
|
92 | [1] | |
93 |
|
93 | |||
94 | $ hg rebase |
|
94 | $ hg rebase | |
95 | nothing to rebase - working directory parent is also destination |
|
95 | nothing to rebase - working directory parent is also destination |
General Comments 0
You need to be logged in to leave comments.
Login now