Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: tools/revert.py

Issue 11299110: Allow force revert for git users as well. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/revert.py
diff --git a/tools/revert.py b/tools/revert.py
index 33d014cd166e193db327cbb1e4aeee022f363772..ce3eff053fdda0d6bd1cbfd4c6c19799b96a9bd0 100755
--- a/tools/revert.py
+++ b/tools/revert.py
@@ -177,14 +177,10 @@ def main():
revisions = parse_args()
git_user = runs_git()
if has_new_code(git_user):
- if git_user:
- maybe_fail('Your tree has local modifications! Move to a clean tree and '
- 'try running this script again.')
- else:
- maybe_fail('WARNING: This checkout has local modifications!! This could '
- 'result in a CL that is not just a revert and/or you could lose your'
- ' local changes! Are you **SURE** you want to continue? ',
- user_input=True)
+ maybe_fail('WARNING: This checkout has local modifications!! This could '
+ 'result in a CL that is not just a revert and/or you could lose your'
+ ' local changes! Are you **SURE** you want to continue? ',
+ user_input=True)
if git_user:
run_cmd(['git', 'cl', 'rebase'])
run_cmd(['gclient', 'sync'])
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698