From 9788236b59d49f1c88ce4e6928c074e9f7b67575 Mon Sep 17 00:00:00 2001 From: "borenet@google.com" Date: Mon, 7 Apr 2014 20:06:02 +0000 Subject: [PATCH] Clarify the .gclient URL mismatch error message BUG= Review URL: https://codereview.chromium.org/227603003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@262182 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gclient.py b/gclient.py index 23f51dbef..71c3138e6 100755 --- a/gclient.py +++ b/gclient.py @@ -1057,8 +1057,11 @@ solutions = [ Your .gclient file seems to be broken. The requested URL is different from what is actually checked out in %(checkout_path)s. -Expected: %(expected_url)s (%(expected_scm)s) -Actual: %(actual_url)s (%(actual_scm)s) +The .gclient file contains: +%(expected_url)s (%(expected_scm)s) + +The local checkout in %(checkout_path)s reports: +%(actual_url)s (%(actual_scm)s) You should ensure that the URL listed in .gclient is correct and either change it or fix the checkout. If you're managing your own git checkout in