[Bps-public-commit] r17511 - Prophet/trunk/lib/Prophet/CLI/Command

[jesse at bestpractical.com]

Author: jesse
Date: Thu Jan  1 21:15:02 2009
New Revision: 17511

Modified:
   Prophet/trunk/lib/Prophet/CLI/Command/Clone.pm

Log:
* When cloning a replica, you always want to accept its 'new' version of the worldview. Even if it had an impossible conflict


Modified: Prophet/trunk/lib/Prophet/CLI/Command/Clone.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Clone.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Clone.pm	Thu Jan  1 21:15:02 2009
@@ -44,6 +44,13 @@
     $self->SUPER::run();
 }
 
+# When we clone from another replica, we ALWAYS want to take their way forward,
+# even when there's an insane, impossible conflict
+#
+sub merge_resolver { 'Prophet::Resolver::AlwaysTarget'}
+
+
+
 __PACKAGE__->meta->make_immutable;
 no Moose;