Show More
@@ -184,8 +184,6 b' def rebase(ui, repo, **opts):' | |||
|
184 | 184 | rebaseset = repo.revs( |
|
185 | 185 | '(children(ancestor(%ld, %d)) and ::(%ld))::', |
|
186 | 186 | base, dest, base) |
|
187 | # temporary top level filtering of extinct revisions | |
|
188 | rebaseset = repo.revs('%ld - hidden()', rebaseset) | |
|
189 | 187 | if rebaseset: |
|
190 | 188 | root = min(rebaseset) |
|
191 | 189 | else: |
@@ -195,7 +193,7 b' def rebase(ui, repo, **opts):' | |||
|
195 | 193 | repo.ui.debug('base is ancestor of destination\n') |
|
196 | 194 | result = None |
|
197 | 195 | elif (not (keepf or obsolete._enabled) |
|
198 |
and repo.revs('first(children(%ld) - %ld) |
|
|
196 | and repo.revs('first(children(%ld) - %ld)', | |
|
199 | 197 | rebaseset, rebaseset)): |
|
200 | 198 | raise util.Abort( |
|
201 | 199 | _("can't remove original changesets with" |
General Comments 0
You need to be logged in to leave comments.
Login now