Commit ebd0b545 authored by jochen@chromium.org's avatar jochen@chromium.org

Only warn if the local working copy is dirty.

That change allows for merging multiple revisions into a local working copy.

TEST=none
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@54399 0039d316-1c4b-4281-b951-d872f2087c98
parent d05e5fb0
......@@ -456,8 +456,8 @@ def drover(options, args):
if not inCheckoutRoot(working):
print "'%s' appears not to be the root of a working copy" % working
return 1
if isSVNDirty():
print "Working copy contains uncommitted files"
if (isSVNDirty() and not
prompt("Working copy contains uncommitted files. Continue?")):
return 1
command = 'svn log ' + url + " -r "+str(revision) + " -v"
......
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