Show More
@@ -1036,7 +1036,7 b' def externalparent(repo, state, destance' | |||
|
1036 | 1036 | return nullrev |
|
1037 | 1037 | if len(parents) == 1: |
|
1038 | 1038 | return parents.pop() |
|
1039 |
raise error.Abort(_('unable to collapse on top of % |
|
|
1039 | raise error.Abort(_('unable to collapse on top of %d, there is more ' | |
|
1040 | 1040 | 'than one external parent: %s') % |
|
1041 | 1041 | (max(destancestors), |
|
1042 | 1042 | ', '.join("%d" % p for p in sorted(parents)))) |
General Comments 0
You need to be logged in to leave comments.
Login now