From b0f852f3720b6bfdd280f3a08f5d84d9b8dc92d9 Mon Sep 17 00:00:00 2001 From: "ilevy@chromium.org" Date: Sat, 15 Sep 2012 01:37:21 +0000 Subject: [PATCH] Fix svn copies for apply_issue _check_output_svn sets the cwd to project_path therefore files should not have project_path. R=maruel@chromium.org,cmp@chromium.org BUG=149702 Review URL: https://chromiumcodereview.appspot.com/10909254 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@156953 0039d316-1c4b-4281-b951-d872f2087c98 --- checkout.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/checkout.py b/checkout.py index 33c0c31a9..c8f240a61 100644 --- a/checkout.py +++ b/checkout.py @@ -341,11 +341,7 @@ class SvnCheckout(CheckoutBase, SvnMixIn): raise PatchApplicationFailed( p, 'File exist but was about to be overwriten') self._check_output_svn( - [ - 'copy', - os.path.join(self.project_path, p.source_filename), - filepath - ]) + ['copy', p.source_filename, p.filename]) if p.diff_hunks: cmd = ['patch', '-p%s' % p.patchlevel, '--forward', '--force'] stdout += subprocess2.check_output(