Reorder CI checks (microsoft#15662)

* Reorder CI checks * Modify error message on local port changes * Modify error message on local port changes - pt.2
strega-nil · Jan 15, 2021 · 3eadeed · 3eadeed
1 parent 8cde8a0
commit 3eadeed
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/vcpkg/commands.civerifyversions.cpp b/src/vcpkg/commands.civerifyversions.cpp
@@ -229,11 +229,10 @@ namespace vcpkg::Commands::CIVerifyVersions
             return {
                 Strings::format("Error: While reading versions for port %s from file: %s\n"
                                 "       File declares version `%s` with SHA: %s\n"
-                                "       But local port with the same verion has a differint SHA: %s\n"
-                                "       This may be caused by locally commited changes to the port.\n"
-                                "       Run:\n\n"
-                                "           vcpkg x-add-version %s --overwrite-version\n\n"
-                                "       to overwrite the declared version's SHA.",
+                                "       But local port with the same verion has a different SHA: %s\n"
+                                "       Please update the port's version fields and then run:\n\n"
+                                "           vcpkg x-add-version %s\n\n"
+                                "       to add a new version.",
                                 port_name,
                                 fs::u8string(versions_file_path),
                                 top_entry.first.versiont,
@@ -402,7 +401,7 @@ namespace vcpkg::Commands::CIVerifyVersions
             }
             System::print2(System::Color::error,
                            "\nTo attempt to resolve all erros at once, run:\n\n"
-                           "    vcpkg x-add-version --all --overwrite-versions\n\n");
+                           "    vcpkg x-add-version --all\n\n");
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
         Checks::exit_success(VCPKG_LINE_INFO);