summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7ac8ebd)
Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
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):
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):
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)
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)
return """
ERROR: Local wizard tag %s did not match repository's. This
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."""
class HeadNotDescendantError(Error):
"""HEAD is not connected to tag."""