[Pkg-bazaar-commits] r185 ./bzr-builddeb/trunk: Fix merge-upstream options so that -v doesn't clash.

[James Westby]

------------------------------------------------------------
revno: 185
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Sun 2007-09-30 10:41:17 +0100
message:
  Fix merge-upstream options so that -v doesn't clash.
added:
  tests/blackbox/test_merge_upstream.py
modified:
  __init__.py
  tests/blackbox/__init__.py
-------------- next part --------------
=== added file 'tests/blackbox/test_merge_upstream.py'
--- a/tests/blackbox/test_merge_upstream.py	1970-01-01 00:00:00 +0000
+++ b/tests/blackbox/test_merge_upstream.py	2007-09-30 09:41:17 +0000
@@ -0,0 +1,28 @@
+#    test_merge_upstream.py -- Blackbox tests for merge-upstream.
+#    Copyright (C) 2007 James Westby <jw+debian at jameswestby.net>
+#    
+#    This file is part of bzr-builddeb.
+#
+#    bzr-builddeb is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    bzr-builddeb is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with bzr-builddeb; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+
+from tests import BuilddebTestCase
+
+
+class TestMergeUpstream(BuilddebTestCase):
+
+  def test_merge_upstream_available(self):
+    self.run_bzr('merge-upstream --help')
+

=== modified file '__init__.py'
--- a/__init__.py	2007-09-21 17:42:09 +0000
+++ b/__init__.py	2007-09-30 09:41:17 +0000
@@ -318,7 +318,7 @@
   package_opt = Option('package', help="The name of the source package.",
                        type=str)
   version_opt = Option('version', help="The version number of the new "
-                       "upstream release. (Required).", type=str, short_name='v')
+                       "upstream release. (Required).", type=str)
   takes_options = [package_opt, version_opt]
 
   def run(self, path, version=None, package=None):

=== modified file 'tests/blackbox/__init__.py'
--- a/tests/blackbox/__init__.py	2007-09-15 22:11:56 +0000
+++ b/tests/blackbox/__init__.py	2007-09-30 09:41:17 +0000
@@ -25,6 +25,7 @@
   testmod_names = [
           'test_builddeb',
           'test_do',
+          'test_merge_upstream',
           ]
   loader = TestUtil.TestLoader()
   suite = loader.loadTestsFromModuleNames(["%s.%s" % (__name__, i)