From: Dave Rolsky <autarch@urth.org>
Date: Fri, 30 Dec 2011 20:36:52 +0000 (-0600)
Subject: Allow a conflicting method to be excluded
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f152dcfe3f8bf8278aa7be981c6ebdb788d11f48;p=gitmo%2FMoose.git

Allow a conflicting method to be excluded
---

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index 822d1e5..ff64c71 100644
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -61,6 +61,8 @@ sub check_required_methods {
         my $required_method_name = $required_method->name;
 
         if (!$class->find_method_by_name($required_method_name)) {
+            next if $self->is_method_excluded($required_method_name)
+                && $required_method->isa('Moose::Meta::Role::Method::Conflicting');
 
             next if $self->is_aliased_method($required_method_name);