[Bps-public-commit] r11814 - in Prophet/trunk: .

[jesse at bestpractical.com]

Author: jesse
Date: Tue Apr 22 10:53:00 2008
New Revision: 11814

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/Resolver/Failed.pm

Log:
 r29965 at 31b:  jesse | 2008-04-22 16:10:50 +0200
 * Slightly better debug information in hte "failed merge" failure message


Modified: Prophet/trunk/lib/Prophet/Resolver/Failed.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Resolver/Failed.pm	(original)
+++ Prophet/trunk/lib/Prophet/Resolver/Failed.pm	Tue Apr 22 10:53:00 2008
@@ -8,10 +8,10 @@
     my $self               = shift;
     my $conflicting_change = shift;
     my $conflict           = shift;
-    #Carp::cluck Dumper($conflict);
-    #use Data::Dumper;
 
-    die "The resolution was not resolved. Sorry dude. (Once Prophet works, you should NEVER see this message)";
+    use YAML::Syck; die 
+    " The resolution was not resolved. Sorry dude. (Once Prophet works, you should NEVER see this message)".
+    YAML::Syck::Dump($conflicting_change, $conflict);
 }
 
 1;