##// END OF EJS Templates
rebase: always pass destination as revnum to _handleskippingobsolete()...
Martin von Zweigbergk -
r33158:5d29c554 default
parent child Browse files
Show More
@@ -317,7 +317,7 b' class rebaseruntime(object):'
317 hint=_('use --keep to keep original changesets'))
317 hint=_('use --keep to keep original changesets'))
318
318
319 obsrevs = _filterobsoleterevs(self.repo, set(rebaseset))
319 obsrevs = _filterobsoleterevs(self.repo, set(rebaseset))
320 self._handleskippingobsolete(rebaseset, obsrevs, dest)
320 self._handleskippingobsolete(rebaseset, obsrevs, dest.rev())
321
321
322 result = buildstate(self.repo, dest, rebaseset, self.collapsef,
322 result = buildstate(self.repo, dest, rebaseset, self.collapsef,
323 self.obsoletenotrebased)
323 self.obsoletenotrebased)
@@ -1464,7 +1464,7 b' def _computeobsoletenotrebased(repo, reb'
1464 if allsuccessors:
1464 if allsuccessors:
1465 # Look for successors of obsolete nodes to be rebased among
1465 # Look for successors of obsolete nodes to be rebased among
1466 # the ancestors of dest
1466 # the ancestors of dest
1467 ancs = cl.ancestors([repo[dest].rev()],
1467 ancs = cl.ancestors([dest],
1468 stoprev=min(allsuccessors),
1468 stoprev=min(allsuccessors),
1469 inclusive=True)
1469 inclusive=True)
1470 for s in allsuccessors:
1470 for s in allsuccessors:
General Comments 0
You need to be logged in to leave comments. Login now