X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/58fee6280427d7af74048b6bce792da2951b077c..514db06cdc7860290aa0f14328cdb8c685047883:/wizard/deploy.py

diff --git a/wizard/deploy.py b/wizard/deploy.py
index 12a2781..6510910 100644
--- a/wizard/deploy.py
+++ b/wizard/deploy.py
@@ -243,10 +243,12 @@ 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)
             if merge_base != parent:
+                # XXX Try remastering
                 raise HeadNotDescendantError(self.app_version.wizard_tag)
 
     def verifyConfigured(self):
@@ -665,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."""
@@ -678,7 +681,8 @@ class HeadNotDescendantError(Error):
 
 ERROR: HEAD is not a descendant of %s.  This probably
 means that an upstream rebase occurred, and new tags were
-pulled, but local user commits were never rebased.""" % self.tag
+pulled, but local user commits were never rebased.  Try
+running 'wizard remaster'.""" % self.tag
 
 class VersionDetectionError(Error):
     """Could not detect real version of application."""