[Bps-public-commit] r11327 - in SVN-PropDB: . doc t

[jesse at bestpractical.com]

Author: jesse
Date: Tue Apr  1 00:29:55 2008
New Revision: 11327

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/doc/todo
   SVN-PropDB/lib/Prophet/Test/Arena.pm
   SVN-PropDB/t/generalized_sync_n_merge.t

Log:
 r28885 at 70-5-78-234:  jesse | 2008-03-31 18:29:43 -1000
  n-by-n sync


Modified: SVN-PropDB/doc/todo
==============================================================================
--- SVN-PropDB/doc/todo	(original)
+++ SVN-PropDB/doc/todo	Tue Apr  1 00:29:55 2008
@@ -4,6 +4,7 @@
 - test byzantine sync behaviour
 
 - prompt for resolution of conflicts
+- handle file_conflict
 - handle conflicting conflict resolutions
 
 

Modified: SVN-PropDB/lib/Prophet/Test/Arena.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Test/Arena.pm	(original)
+++ SVN-PropDB/lib/Prophet/Test/Arena.pm	Tue Apr  1 00:29:55 2008
@@ -43,12 +43,11 @@
 sub sync_all_pairs {
     my $self = shift;
 
-    my @chickens_a = shuffle(@{$self->chickens});
-    my @chickens_b = shuffle(@{$self->chickens});
+
+    my @chickens_a = shuffle @{$self->chickens};
+    my @chickens_b = shuffle @{$self->chickens};
     
     pairwise {
-        warn $a;
-        warn $b;
         return if $a->name eq $b->name;
         $a->sync_from_peer($b);
     } @chickens_a, @chickens_b;
@@ -56,4 +55,4 @@
     
 
 }
-1;
\ No newline at end of file
+1;

Modified: SVN-PropDB/t/generalized_sync_n_merge.t
==============================================================================
--- SVN-PropDB/t/generalized_sync_n_merge.t	(original)
+++ SVN-PropDB/t/generalized_sync_n_merge.t	Tue Apr  1 00:29:55 2008
@@ -14,12 +14,12 @@
     $arena->step('create_record');
 }
 
-for(1..10) {
+for(1..5) {
     $arena->step();
 }
 
 $arena->sync_all_pairs;
-
+exit;
 for (@{$arena->chickens}) {
     warn $_->name;
     as_user( $_->name, sub {