From c6d170e5164a77c3b0ac4b9adfe9c14994007477 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 3 Jun 2010 00:06:00 +0000 Subject: [PATCH] Fix gcl upload with moved files without modification on Windows. Review URL: http://codereview.chromium.org/2545001 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@48793 0039d316-1c4b-4281-b951-d872f2087c98 --- scm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scm.py b/scm.py index 11c977a64b..5f3a9bee1a 100644 --- a/scm.py +++ b/scm.py @@ -45,6 +45,7 @@ def GetCasedPath(path): def GenFakeDiff(filename): """Generates a fake diff from a file.""" file_content = gclient_utils.FileRead(filename, 'rb').splitlines(True) + filename = filename.replace(os.sep, '/') nb_lines = len(file_content) # We need to use / since patch on unix will fail otherwise. data = cStringIO.StringIO() @@ -730,7 +731,7 @@ class SVN(object): data = SVN.Capture(command, None) if not data: # We put in an empty Index entry so upload.py knows about them. - data = "Index: %s\n" % filename + data = "Index: %s\n" % filename.replace(os.sep, '/') # Otherwise silently ignore directories. else: if info.get("Node Kind") != "directory":