Show More
@@ -1478,7 +1478,7 def tryimportone(ui, repo, hunk, parents | |||||
1478 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, |
|
1478 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, | |
1479 | files, eolmode=None) |
|
1479 | files, eolmode=None) | |
1480 | except error.PatchError as e: |
|
1480 | except error.PatchError as e: | |
1481 | raise error.Abort(str(e)) |
|
1481 | raise error.Abort(util.forcebytestr(e)) | |
1482 | if opts.get('exact'): |
|
1482 | if opts.get('exact'): | |
1483 | editor = None |
|
1483 | editor = None | |
1484 | else: |
|
1484 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now