Show More
@@ -317,7 +317,7 b' class rebaseruntime(object):' | |||
|
317 | 317 | hint=_('use --keep to keep original changesets')) |
|
318 | 318 | |
|
319 | 319 | obsrevs = _filterobsoleterevs(self.repo, set(rebaseset)) |
|
320 | self._handleskippingobsolete(rebaseset, obsrevs, dest) | |
|
320 | self._handleskippingobsolete(rebaseset, obsrevs, dest.rev()) | |
|
321 | 321 | |
|
322 | 322 | result = buildstate(self.repo, dest, rebaseset, self.collapsef, |
|
323 | 323 | self.obsoletenotrebased) |
@@ -1464,7 +1464,7 b' def _computeobsoletenotrebased(repo, reb' | |||
|
1464 | 1464 | if allsuccessors: |
|
1465 | 1465 | # Look for successors of obsolete nodes to be rebased among |
|
1466 | 1466 | # the ancestors of dest |
|
1467 |
ancs = cl.ancestors([ |
|
|
1467 | ancs = cl.ancestors([dest], | |
|
1468 | 1468 | stoprev=min(allsuccessors), |
|
1469 | 1469 | inclusive=True) |
|
1470 | 1470 | for s in allsuccessors: |
General Comments 0
You need to be logged in to leave comments.
Login now