If both -R and -D are specified when updating, remove all untracked directories

If both -R and -D are specified when updating, remove all untracked directories 

This is required to avoid the need to clobber the bots when moving a directory 
to deps/. Currently, the directory in question is likely to remain in the 
working copy, despite having been removed, due to the presence of untracked 
files. This causes the checkout from deps/ to fail. 

With this change, when both --reset and --delete_unversioned_trees are 
specified, the the directory in question will be removed from the working copy, 
thereby allowing the copy in deps/ to be checked out correctly. 

Note that untracked directories which are explicitly ignored (ie in .gitignore 
or svn:ignore) will not be removed. 

Note that this was previously landed in http://codereview.chromium.org/9348054 
but reverted due to problems with symlinks in the chromeos build. 

BUG=112887, chromium-os:20759
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=122300

[Marc-Antoine Ruel (Google), 2012-02-15 18:55:25]

One nit, can you change all --force references to --reset?

This way, we wouldn't have to do some slow svn operations or modify buildbot's
behavior.

[Marc-Antoine Ruel (Google), 2012-02-16 01:39:06]

Sorry for the extreme sed'ing I forced you to do.

lgtm

Note that I'd prefer it to be checked in tomorrow around 9am MTV time so cros
people can notice if anything goes wrong.

[commit-bot: I haz the power, 2012-02-16 16:23:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/steveblock@chromium.org/9404014/2003

[commit-bot: I haz the power, 2012-02-16 16:29:18]

Presubmit check for 9404014-2003 failed and returned exit status 1.

warning: code.google.com certificate with fingerprint
08:b0:3f:75:80:9e:e3:e5:30:a8:75:5e:03:64:15:7e:95:59:dc:c7 not verified (check
hostfingerprints or web.cacerts config setting)
Running presubmit commit checks ...
Checking out rietveld...
Running push-basic.sh
Running save-description-on-failure.sh
Running basic.sh
Running upload-stale.sh
Running upload-local-tracking-branch.sh
Running patch.sh
Running submit-from-new-dir.sh
Running post-dcommit-hook-test.sh
Running hooks.sh
Running abandon.sh
Running upstream.sh

** Presubmit Messages **
You should install python 2.5 and run ln -s $(which python2.5) python.
A great place to put this symlink is in depot_tools.
Otherwise, you break depot_tools on python 2.5, you get to keep the pieces.

** Presubmit ERRORS **
Missing LGTM from an OWNER for:
depot_tools/gclient_scm.py,depot_tools/gclient.py,depot_tools/tests/gclient_scm_test.py

Presubmit checks took 359.8s to calculate.

[M-A Ruel, 2012-02-16 16:30:29]

&±@)?/!!!

lgtm

[commit-bot: I haz the power, 2012-02-16 16:30:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/steveblock@chromium.org/9404014/2003

[commit-bot: I haz the power, 2012-02-16 16:36:44]

Change committed as 122300