##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Fix read mode when importing patch.
Patrick Mezard -
r4646:196d90bf default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1482,7 +1482,7 b' def import_(ui, repo, patch1, *patches, '
1482 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
1482 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, sys.stdin)
1483 else:
1483 else:
1484 ui.status(_("applying %s\n") % p)
1484 ui.status(_("applying %s\n") % p)
1485 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf))
1485 tmpname, message, user, date, branch, nodeid, p1, p2 = patch.extract(ui, file(pf, 'rb'))
1486
1486
1487 if tmpname is None:
1487 if tmpname is None:
1488 raise util.Abort(_('no diffs found'))
1488 raise util.Abort(_('no diffs found'))
General Comments 0
You need to be logged in to leave comments. Login now