Rev 2665: (merge) tag command help (joachim) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2665
revision-id: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
parent: mbp at sourcefrog.net-20070731224020-rbpeno86xyzp9rzi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-01 01:05:18 +0100
message:
  (merge) tag command help (joachim)
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
    ------------------------------------------------------------
    revno: 2664.1.1
    merged: mbp at sourcefrog.net-20070731224020-rbpeno86xyzp9rzi
    parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
    parent: jocke at vmlinux.org-20070731220847-9zenki6olnl5yzmq
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: merge
    timestamp: Tue 2007-07-31 17:40:20 -0500
    message:
      (merge) tag command help (joachim)
    ------------------------------------------------------------
    revno: 2664.2.2
    merged: jocke at vmlinux.org-20070731220847-9zenki6olnl5yzmq
    parent: jocke at vmlinux.org-20070731200247-zog40273ukdmlqry
    committer: Joachim Nilsson <jocke at vmlinux.org>
    branch nick: bzr.dev
    timestamp: Wed 2007-08-01 00:08:47 +0200
    message:
      Update tag test to match new description.
    ------------------------------------------------------------
    revno: 2664.2.1
    merged: jocke at vmlinux.org-20070731200247-zog40273ukdmlqry
    parent: pqm at pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
    committer: Joachim Nilsson <jocke at vmlinux.org>
    branch nick: bzr.dev
    timestamp: Tue 2007-07-31 22:02:47 +0200
    message:
      Change tag description for "help commands" to make it easier to find
      what command to use for altering already placed tags.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2007-07-31 11:20:50 +0000
+++ b/bzrlib/builtins.py	2007-07-31 20:02:47 +0000
@@ -3841,7 +3841,7 @@
 
 
 class cmd_tag(Command):
-    """Create a tag naming a revision.
+    """Create, remove or modify a tag naming a revision.
     
     Tags give human-meaningful names to revisions.  Commands that take a -r
     (--revision) option can be given -rtag:X, where X is any previously

=== modified file 'bzrlib/tests/blackbox/test_tags.py'
--- a/bzrlib/tests/blackbox/test_tags.py	2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_tags.py	2007-07-31 22:08:47 +0000
@@ -40,7 +40,7 @@
 
     def test_tag_command_help(self):
         out, err = self.run_bzr('help tag')
-        self.assertContainsRe(out, 'Create a tag')
+        self.assertContainsRe(out, 'Create, remove or modify a tag')
 
     def test_cannot_tag_range(self):
         out, err = self.run_bzr('tag -r1..10 name', retcode=3)