SVN.GenerateDiff assumes SVN.Capture captures stderr.

scm.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 379 matching lines @@
 
 class SVN(object):
   current_version = None
 
   @staticmethod
   def Capture(args, **kwargs):
     """Always redirect stderr.
 
     Throws an exception if non-0 is returned.
     """
-    return subprocess2.check_output(['svn'] + args, **kwargs)
+    return subprocess2.check_output(
+        ['svn'] + args, stderr=subprocess2.PIPE, **kwargs)
 
   @staticmethod
   def RunAndGetFileList(verbose, args, cwd, file_list, stdout=None):
     """Runs svn checkout, update, or status, output to stdout.
 
     The first item in args must be either "checkout", "update", or "status".
 
     svn's stdout is parsed to collect a list of files checked out or updated.
     These files are appended to file_list.  svn's stdout is also printed to
     sys.stdout as in Run.
@@ skipping 570 matching lines @@
       if (file_status[0][0] in ('D', 'A', '!') or
           not file_status[0][1:].isspace()):
         # Added, deleted file requires manual intervention and require calling
         # revert, like for properties.
         try:
           SVN.Capture(['revert', file_status[1]], cwd=repo_root)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise