[Pkg-bazaar-commits] r190 ./bzr-builddeb/trunk: * Improve the error message when the upstream tag is not found to actually

[James Westby]

------------------------------------------------------------
revno: 190
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Wed 2007-10-31 19:17:23 +0000
message:
  * Improve the error message when the upstream tag is not found to actually
    give the name of the expected tag.
modified:
  __init__.py
  debian/changelog
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-10-29 22:16:30 +0000
+++ b/__init__.py	2007-10-31 19:17:23 +0000
@@ -369,10 +369,11 @@
       merge_upstream(tree, filename, version)
     # TODO: tidy all of this up, and be more precise in what is wrong and
     #       what can be done.
-    except NoSuchTag:
+    except NoSuchTag, e:
       raise BzrCommandError("The tag of the last upstream import can not be "
                             "found. You should tag the revision that matches "
-                            "the last upstream version")
+                            "the last upstream version. Expected to find %s." % \
+                            e.tag_name)
     except TagAlreadyExists:
       raise BzrCommandError("It appears as though this merge has already "
                             "been performed, as there is already a tag "

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-10-31 18:45:37 +0000
+++ b/debian/changelog	2007-10-31 19:17:23 +0000
@@ -8,8 +8,10 @@
     will totally mess things up. If the branch is in the source package then
     just use apt-get source. (LP: #156003)
   * bzr 0.92 is required.
+  * Improve the error message when the upstream tag is not found to actually
+    give the name of the expected tag.
 
- -- James Westby <jw+debian at jameswestby.net>  Wed, 31 Oct 2007 18:44:43 +0000
+ -- James Westby <jw+debian at jameswestby.net>  Wed, 31 Oct 2007 19:15:54 +0000
 
 bzr-builddeb (0.91) unstable; urgency=low