diff -r 2b1ffaaab01f -r 57d35d3c1cf1 hgext/rebase.py --- a/hgext/rebase.py Mon Dec 01 18:51:10 2014 -0600 +++ b/hgext/rebase.py Tue Dec 02 11:06:38 2014 -0800 @@ -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)