equal
deleted
inserted
replaced
447 targetnode = repo[target].node() |
447 targetnode = repo[target].node() |
448 |
448 |
449 # restore original working directory |
449 # restore original working directory |
450 # (we do this before stripping) |
450 # (we do this before stripping) |
451 newwd = state.get(originalwd, originalwd) |
451 newwd = state.get(originalwd, originalwd) |
|
452 if newwd < 0: |
|
453 # original directory is a parent of rebase set root or ignored |
|
454 newwd = originalwd |
452 if newwd not in [c.rev() for c in repo[None].parents()]: |
455 if newwd not in [c.rev() for c in repo[None].parents()]: |
453 ui.note(_("update back to initial working directory parent\n")) |
456 ui.note(_("update back to initial working directory parent\n")) |
454 hg.updaterepo(repo, newwd, False) |
457 hg.updaterepo(repo, newwd, False) |
455 |
458 |
456 if not keepf: |
459 if not keepf: |