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

[Daniel Watkins]

On Thu, 17 Jul 2008 09:25:39 -0400 (EDT)
Robert Collins <robertc at robertcollins.net> wrote:
> 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)
Done in attached.

-- 
Daniel Watkins (Odd_Bloke)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 116656.2.patch
Type: text/x-patch
Size: 5652 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080717/862f65ea/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080717/862f65ea/attachment-0001.pgp