Skip to content
Snippets Groups Projects
Commit 46c2331fc750 authored by Matt Mackall's avatar Matt Mackall
Browse files

rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)

parent 82cbaf025b98
No related branches found
No related tags found
No related merge requests found
......@@ -658,6 +658,7 @@
def restorestatus(repo):
'Restore a previously stored status'
try:
keepbranches = None
target = None
collapse = False
external = nullrev
......@@ -687,6 +688,10 @@
state[repo[oldrev].rev()] = int(newrev)
else:
state[repo[oldrev].rev()] = repo[newrev].rev()
if keepbranches is None:
raise util.Abort(_('.hg/rebasestate is incomplete'))
skipped = set()
# recompute the set of skipped revs
if not collapse:
......
......@@ -13,6 +13,16 @@
$ hg init a
$ cd a
$ touch .hg/rebasestate
$ hg sum
parent: -1:000000000000 tip (empty repository)
branch: default
commit: (clean)
update: (current)
abort: .hg/rebasestate is incomplete
[255]
$ rm .hg/rebasestate
$ echo c1 > common
$ hg add common
$ hg ci -m C1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment