##// END OF EJS Templates
py3: use '%d' for integers instead of b'%s'...
Pulkit Goyal -
r36496:a6e9a360 default
parent child Browse files
Show More
@@ -1036,7 +1036,7 b' def externalparent(repo, state, destance'
1036 return nullrev
1036 return nullrev
1037 if len(parents) == 1:
1037 if len(parents) == 1:
1038 return parents.pop()
1038 return parents.pop()
1039 raise error.Abort(_('unable to collapse on top of %s, there is more '
1039 raise error.Abort(_('unable to collapse on top of %d, there is more '
1040 'than one external parent: %s') %
1040 'than one external parent: %s') %
1041 (max(destancestors),
1041 (max(destancestors),
1042 ', '.join("%d" % p for p in sorted(parents))))
1042 ', '.join("%d" % p for p in sorted(parents))))
General Comments 0
You need to be logged in to leave comments. Login now