mirror of
https://github.com/golang/go
synced 2024-11-05 18:36:08 +00:00
codereview: fix upload of hg copied file
Fixes #1134. R=r, r2 CC=golang-dev https://golang.org/cl/2264043
This commit is contained in:
parent
5474e166bc
commit
9499856488
1 changed files with 1 additions and 1 deletions
|
@ -2600,7 +2600,7 @@ class MercurialVCS(VersionControlSystem):
|
|||
if use_hg_shell:
|
||||
base_content = RunShell(["hg", "cat", "-r", base_rev, oldrelpath], silent_ok=True)
|
||||
else:
|
||||
base_content = str(self.repo[base_rev][filename].data())
|
||||
base_content = str(self.repo[base_rev][oldrelpath].data())
|
||||
is_binary = "\0" in base_content # Mercurial's heuristic
|
||||
if status != "R":
|
||||
new_content = open(relpath, "rb").read()
|
||||
|
|
Loading…
Reference in a new issue