Add code to correctly revert a svn add'ed file.

scm.py

 # Copyright (c) 2010 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 860 matching lines @@
       if callback:
         callback(file_status)
 
       if file_status[0].isspace():
         # Try reverting the file since it's probably a property change.
         gclient_utils.CheckCall(
             ['svn', 'revert', file_status[1]], cwd=repo_root)
 
       # svn revert is really stupid. It fails on inconsistent line-endings,
       # on switched directories, etc. So take no chance and delete everything!
-      if file_status[0][0] in ('D', 'A') or file_status[0][2] != ' ':
+      if file_status[0][0] in ('D', 'A', '!') or file_status[0][2] != ' ':
         # Added, deleted file requires manual intervention and require calling
         # revert, like for properties.
         try:
           SVN.Capture(['revert', file_status[1]], cwd=repo_root)
         except gclient_utils.CheckCallError:
           if not os.path.exists(file_path):
             continue
           raise
 
       if not os.path.exists(file_path):
         continue
 
       if os.path.isfile(file_path) or os.path.islink(file_path):
         logging.info('os.remove(%s)' % file_path)
         os.remove(file_path)
       elif os.path.isdir(file_path):
         logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
         gclient_utils.RemoveDirectory(file_path)
       else:
         logging.critical(
           ('No idea what is %s.\nYou just found a bug in gclient'
             ', please ping maruel@chromium.org ASAP!') % file_path)