Show More
@@ -201,7 +201,7 b' def rebase(ui, repo, **opts):' | |||
|
201 | 201 | root = None |
|
202 | 202 | |
|
203 | 203 | if not rebaseset: |
|
204 | repo.ui.debug('base is ancestor of destination') | |
|
204 | repo.ui.debug('base is ancestor of destination\n') | |
|
205 | 205 | result = None |
|
206 | 206 | elif not keepf and list(repo.revs('first(children(%ld) - %ld)', |
|
207 | 207 | rebaseset, rebaseset)): |
@@ -618,7 +618,7 b' def buildstate(repo, dest, rebaseset, de' | |||
|
618 | 618 | if commonbase == dest: |
|
619 | 619 | samebranch = root.branch() == dest.branch() |
|
620 | 620 | if samebranch and root in dest.children(): |
|
621 | repo.ui.debug('source is a child of destination') | |
|
621 | repo.ui.debug('source is a child of destination\n') | |
|
622 | 622 | return None |
|
623 | 623 | # rebase on ancestor, force detach |
|
624 | 624 | detach = True |
General Comments 0
You need to be logged in to leave comments.
Login now