Revert r121986 "If both -f and -D are specified when updating, remove all untracked directories"

gclient.py

Index: gclient.py
diff --git a/gclient.py b/gclient.py
index f6f75d812ca122d100345e4fdc22a1dbe2a0f85e..a9b14bf9ac4981bbf8a8fe0fd8a7b9af1bfa201e 100644
--- a/gclient.py
+++ b/gclient.py
@@ -1300,14 +1300,10 @@ def CMDsync(parser, args):
                     help='skips any safesync_urls specified in '
                          'configured solutions and sync to head instead')
   parser.add_option('-D', '--delete_unversioned_trees', action='store_true',
-                    help='Deletes from the working copy any dependencies that '
-                         'have been removed since the last sync, as long as '
-                         'there are no local modifications. When used with '
-                         '--force, such dependencies are removed even if they '
-                         'have local modifications. In addition, when used '
-                         'with --force, all untracked directories are removed '
-                         'from the working copy, exclusing those which are '
-                         'explicitly ignored in the repository.')
+                    help='delete any dependency that have been removed from '
+                         'last sync as long as there is no local modification. '
+                         'Coupled with --force, it will remove them even with '
+                         'local modifications')
   parser.add_option('-R', '--reset', action='store_true',
                     help='resets any local changes before updating (git only)')
   parser.add_option('-M', '--merge', action='store_true',
@@ -1372,7 +1368,6 @@ def CMDrevert(parser, args):
   (options, args) = parser.parse_args(args)
   # --force is implied.
   options.force = True
-  options.delete_unversioned_trees = False
   client = GClient.LoadCurrentConfig(options)
   if not client:
     raise gclient_utils.Error('client not configured; see \'gclient config\'')