From 514db06cdc7860290aa0f14328cdb8c685047883 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 17 Jul 2011 01:27:16 -0400 Subject: [PATCH] More remaster points! Signed-off-by: Edward Z. Yang --- wizard/deploy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wizard/deploy.py b/wizard/deploy.py index ac7dae8..6510910 100644 --- 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.""" -- 2.44.0