Show More
@@ -273,9 +273,9 b' def rebase(ui, repo, **opts):' | |||||
273 | ui.status(_('empty "base" revision set - ' |
|
273 | ui.status(_('empty "base" revision set - ' | |
274 | "can't compute rebase set\n")) |
|
274 | "can't compute rebase set\n")) | |
275 | return 1 |
|
275 | return 1 | |
276 | rebaseset = repo.revs( |
|
276 | commonanc = repo.revs('ancestor(%ld, %d)', base, dest).first() | |
277 | '(children(ancestor(%ld, %d)) and ::(%ld))::', |
|
277 | rebaseset = repo.revs('(%d::(%ld) - %d)::', | |
278 | base, dest, base) |
|
278 | commonanc, base, commonanc) | |
279 | if not rebaseset: |
|
279 | if not rebaseset: | |
280 | # transform to list because smartsets are not comparable to |
|
280 | # transform to list because smartsets are not comparable to | |
281 | # lists. This should be improved to honor lazyness of |
|
281 | # lists. This should be improved to honor lazyness of |
General Comments 0
You need to be logged in to leave comments.
Login now