Show More
@@ -474,6 +474,11 b' class localrepository(repo.repository):' | |||||
474 | n = self.changelog._partialmatch(key) |
|
474 | n = self.changelog._partialmatch(key) | |
475 | if n: |
|
475 | if n: | |
476 | return n |
|
476 | return n | |
|
477 | ||||
|
478 | # can't find key, check if it might have come from damaged dirstate | |||
|
479 | if key in self.dirstate.parents(): | |||
|
480 | raise error.Abort(_("working directory has unknown parent '%s'!") | |||
|
481 | % short(key)) | |||
477 | try: |
|
482 | try: | |
478 | if len(key) == 20: |
|
483 | if len(key) == 20: | |
479 | key = hex(key) |
|
484 | key = hex(key) |
General Comments 0
You need to be logged in to leave comments.
Login now