equal
deleted
inserted
replaced
287 for old, new in sorted(state.items()): |
287 for old, new in sorted(state.items()): |
288 if new != revtodo and new in seen: |
288 if new != revtodo and new in seen: |
289 skipped.add(old) |
289 skipped.add(old) |
290 seen.add(new) |
290 seen.add(new) |
291 repo.ui.debug('computed skipped revs: %s\n' % |
291 repo.ui.debug('computed skipped revs: %s\n' % |
292 (' '.join(str(r) for r in sorted(skipped)) or None)) |
292 (' '.join('%d' % r for r in sorted(skipped)) or '')) |
293 repo.ui.debug('rebase status resumed\n') |
293 repo.ui.debug('rebase status resumed\n') |
294 |
294 |
295 self.originalwd = originalwd |
295 self.originalwd = originalwd |
296 self.destmap = destmap |
296 self.destmap = destmap |
297 self.state = state |
297 self.state = state |