Rev 178: Added test. in http://bzr.daniel-watkins.co.uk/pqm/116656

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/116656

------------------------------------------------------------
revno: 178
revision-id: daniel at daniel-watkins.co.uk-20080715105448-jvn0fbxb8c4s7715
parent: daniel at daniel-watkins.co.uk-20080715104619-p4kuqqcfyfnflldr
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: 116656
timestamp: Tue 2008-07-15 11:54:48 +0100
message:
  Added test.
-------------- next part --------------
=== modified file 'pqm/tests/test_pqm.py'
--- a/pqm/tests/test_pqm.py	2008-07-10 07:43:40 +0000
+++ b/pqm/tests/test_pqm.py	2008-07-15 10:54:48 +0000
@@ -589,6 +589,20 @@
             return
         self.fail("Merge conflict not raised.")
 
+    def test_merge_unrelated(self):
+        unrelated = self.make_branch_and_tree('unrelated')
+        unrelated.commit("unrelated first commit")
+        handler = pqm.Bazaar2Handler()
+        try:
+            handler.do_star_merge("me", "unrelated", "bzrbranch")
+        except pqm.PQMTlaFailure, e:
+            self.assertEqual(
+                ["Branches have no common ancestor, and no merge base"
+                 " revision was specified."],
+                 e.output)
+            return
+        self.fail("Merge base error not raised.")
+
 
 class TestConfig(unittest.TestCase):