More remaster points!

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/wizard/deploy.py b/wizard/deploy.py
index ac7dae8e31e395642fcec9281b677aa982fbc5a4..651091097d407236b9f06507012c8e881da6e879 100644 (file)
--- a/wizard/deploy.py
+++ b/wizard/deploy.py
@@ -243,6 +243,7 @@ class Deployment(object):
             if not compare_tags(self.app_version.pristine_tag):
                 raise InconsistentPristineTagError(self.app_version.pristine_tag)
             if not compare_tags(self.app_version.wizard_tag):
+                # XXX Try remastering
                 raise InconsistentWizardTagError(self.app_version.wizard_tag)
             parent = repo_rev_parse(self.app_version.wizard_tag)
             merge_base = shell.safeCall("git", "merge-base", parent, "HEAD", strip=True)
@@ -666,7 +667,8 @@ class InconsistentWizardTagError(Error):
         return """
 
 ERROR: Local wizard tag %s did not match repository's.  This
-probably means an upstream rebase occurred.""" % self.tag
+probably means an upstream rebase occurred.  Try
+'git fetch --tags && wizard remaster'.""" % self.tag
 
 class HeadNotDescendantError(Error):
     """HEAD is not connected to tag."""