[Bps-public-commit] r14178 - in Prophet/trunk: . lib/Prophet/CLI/Command

[sartak at bestpractical.com]

Author: sartak
Date: Wed Jul 16 18:55:40 2008
New Revision: 14178

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm
   Prophet/trunk/lib/Prophet/Replica.pm

Log:
 r64450 at onn:  sartak | 2008-07-16 18:29:55 -0400
 Need to expect and pass "force" when importing resolutions


Modified: Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	Wed Jul 16 18:55:40 2008
@@ -9,7 +9,10 @@
     my $source = Prophet::Replica->new( { url => $self->arg('from') } );
     my $target = Prophet::Replica->new( { url => $self->arg('to') } );
 
-    $target->import_resolutions_from_remote_replica( from => $source );
+    $target->import_resolutions_from_remote_replica(
+        from  => $source,
+        force => $self->has_arg('force'),
+    );
 
     $self->_do_merge( $source, $target );
 

Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm	(original)
+++ Prophet/trunk/lib/Prophet/Replica.pm	Wed Jul 16 18:55:40 2008
@@ -158,7 +158,8 @@
         {   from              => { isa      => 'Prophet::Replica' },
             resolver          => { optional => 1 },
             resolver_class    => { optional => 1 },
-            conflict_callback => { optional => 1 }
+            conflict_callback => { optional => 1 },
+            force             => { optional => 1 },
         }
     );
     my $source = $args{'from'};
@@ -168,8 +169,8 @@
 
     $self->resolution_db_handle->import_changesets(
         from     => $source->resolution_db_handle,
-        resolver => sub { die "not implemented yet" }
-
+        resolver => sub { die "not implemented yet" },
+        force    => $args{force},
     );
 }