changeset 23457 | fc76f55705eb |
parent 23266 | 3480c07fc934 |
parent 23440 | 57d35d3c1cf1 |
child 23459 | 2e047b1558a5 |
--- a/hgext/rebase.py Tue Nov 18 22:18:05 2014 -0800 +++ b/hgext/rebase.py Tue Dec 02 17:19:20 2014 -0600 @@ -449,6 +449,9 @@ # restore original working directory # (we do this before stripping) newwd = state.get(originalwd, originalwd) + if newwd < 0: + # original directory is a parent of rebase set root or ignored + newwd = originalwd if newwd not in [c.rev() for c in repo[None].parents()]: ui.note(_("update back to initial working directory parent\n")) hg.updaterepo(repo, newwd, False)