From ebd0b545004c8c2a7cfe386940916e169d29d96a Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Fri, 30 Jul 2010 22:26:21 +0000 Subject: [PATCH] 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 --- drover.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drover.py b/drover.py index a583097cd..6dbd0d5d9 100755 --- a/drover.py +++ b/drover.py @@ -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"