Commit 810a50b1 authored by maruel@chromium.org's avatar maruel@chromium.org

Fix a specific failure when reverting embedded directories.

TEST=gclient revert doesn't throw an exception
BUG=none

Review URL: http://codereview.chromium.org/255083

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@28059 0039d316-1c4b-4281-b951-d872f2087c98
parent 9344e97a
......@@ -370,9 +370,15 @@ class SVNWrapper(SCMWrapper):
except EnvironmentError:
logging.error('Failed to remove %s.' % file_path)
try:
# svn revert is so broken we don't even use it. Using
# "svn up --revision BASE" achieve the same effect.
RunSVNAndGetFileList(['update', '--revision', 'BASE'], path, file_list)
RunSVNAndGetFileList(['update', '--revision', 'BASE'], path,
file_list)
except OSError, e:
# Maybe the directory disapeared meanwhile. We don't want it to throw an
# exception.
logging.error('Failed to update:\n%s' % str(e))
def runhooks(self, options, args, file_list):
self.status(options, args, file_list)
......
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