commit 74ac038d27ebb4ee5a92c9c3067587ee1dd12d31
author Haowei Wu <haowei@google.com> Wed Nov 06 17:23:59 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Nov 06 17:23:59 2019 +0000
tree 3c8b5d53542dd351f820c6feae130815a74c1843
parent eff7bed529afcc20e92898259e64340402df8745

[override] Revise the override warning.

This change revises the override warning to make it easier to
interpretate.

Bug: 39636
Change-Id: Ib8bfb7604071d94b6c829bf581df6d6f0e375917

project/manifest.go

diff --git a/project/manifest.go b/project/manifest.go
index a8de3ce..be40f99 100644
--- a/project/manifest.go
+++ b/project/manifest.go
@@ -638,7 +638,7 @@
 			if revision == "" {
 				revision = "HEAD"
 			}
-			jirix.Logger.Warningf("Project %s(remote: %s) is overridden to revision %s, if this is not your intention, please run \"jiri override --delete %s %s\" to disable it.", v.Name, v.Remote, revision, v.Name, v.Remote)
+			jirix.Logger.Warningf("Project %s(remote: %s) is pinned to revision %s, if that is not what you want, please run \"jiri override --delete %s %s\" to unpin it.", v.Name, v.Remote, revision, v.Name, v.Remote)
 			jirix.OverrideWarned = true
 		}
 	}
@@ -648,7 +648,7 @@
 			if revision == "" {
 				revision = "HEAD"
 			}
-			jirix.Logger.Warningf("Import %s(remote: %s) is overridden to revision %s, if this is not your intention, please run \"jiri override --import-manifest=%s --delete %s %s\" to disable it.", v.Name, v.Remote, revision, v.Manifest, v.Name, v.Remote)
+			jirix.Logger.Warningf("Import %s(remote: %s) is pinned to revision %s, if that is not what you want, please run \"jiri override --import-manifest=%s --delete %s %s\" to unpin it.", v.Name, v.Remote, revision, v.Manifest, v.Name, v.Remote)
 			jirix.OverrideWarned = true
 		}
 	}