[MERGE][PQM][Bug #116656] Email failures due to a lack of merge base

[Robert Collins]

Robert Collins has voted tweak.
Status is now: Semi-approved
Comment:
+        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

err = self.assertRaises(pqm.PQMTlaFailure, handler.do_star_merge, "me", 
"unrelated", "bzrbranch")
self.assertEqual(["Branches have no common ancestor, and no merge base"
   " revision was specified."], err.output)

:)

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20080715115917.16bb8365%40lapbert%3E