Commit c3150203 authored by maruel@chromium.org's avatar maruel@chromium.org

Fix a regression on svn cp|ren|mv on gcl upload.

BUG=11884
Review URL: http://codereview.chromium.org/113341

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@15953 0039d316-1c4b-4281-b951-d872f2087c98
parent 7196846f
...@@ -673,10 +673,13 @@ def GenerateDiff(files, root=None): ...@@ -673,10 +673,13 @@ def GenerateDiff(files, root=None):
output = RunShell(["svn", "diff", "--config-dir", bogus_dir, file]) output = RunShell(["svn", "diff", "--config-dir", bogus_dir, file])
if output: if output:
diff.append(output) diff.append(output)
# On Posix platforms, svn diff on a mv/cp'd file outputs nothing. elif IsSVNMoved(file):
# We put in an empty Index entry so upload.py knows about them. # svn diff on a mv/cp'd file outputs nothing.
elif not sys.platform.startswith("win") and IsSVNMoved(file): # We put in an empty Index entry so upload.py knows about them.
diff.append("\nIndex: %s\n" % file) diff.append("\nIndex: %s\n" % file)
else:
# The file is not modified anymore. It should be removed from the set.
pass
os.chdir(previous_cwd) os.chdir(previous_cwd)
return "".join(diff) return "".join(diff)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment