Rev 2260: stubbed-out tests in http://sourcefrog.net/bzr/tags

[Martin Pool]

At http://sourcefrog.net/bzr/tags

------------------------------------------------------------
revno: 2260
revision-id: mbp at sourcefrog.net-20070226050833-jnc2m7sji8uzrnk8
parent: mbp at sourcefrog.net-20070225114916-6ahkk1nkyknophma
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Mon 2007-02-26 16:08:33 +1100
message:
  stubbed-out tests
modified:
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
=== modified file 'bzrlib/tests/blackbox/test_tags.py'
--- a/bzrlib/tests/blackbox/test_tags.py	2007-02-25 11:49:16 +0000
+++ b/bzrlib/tests/blackbox/test_tags.py	2007-02-26 05:08:33 +0000
@@ -121,3 +121,7 @@
         out, err = self.run_bzr('pull', '-d', 'one', 'two', encoding='utf-8')
         self.assertContainsRe(out,
                 'Conflicting tags:\n.*' + tagname.encode('utf-8'))
+        # merge should give a warning about the tags -- not implemented yet
+        ## out, err = self.run_bzr('merge', '-d', 'one', 'two', encoding='utf-8')
+        ## self.assertContainsRe(out,
+        ##         'Conflicting tags:\n.*' + tagname.encode('utf-8'))