[Bps-public-commit] r12428 - in Prophet/branches/moose: . t

[sartak at bestpractical.com]

Author: sartak
Date: Sat May 17 04:10:50 2008
New Revision: 12428

Modified:
   Prophet/branches/moose/   (props changed)
   Prophet/branches/moose/lib/Prophet/ChangeSet.pm
   Prophet/branches/moose/t/real-conflicting-merge.t
   Prophet/branches/moose/t/simple-conflicting-merge.t
   Prophet/branches/moose/t/simple-push.t

Log:
 r56135 at onn:  sartak | 2008-05-17 04:10:46 -0400
 Don't serialize is_empty, it's available by looking at @changes anyway


Modified: Prophet/branches/moose/lib/Prophet/ChangeSet.pm
==============================================================================
--- Prophet/branches/moose/lib/Prophet/ChangeSet.pm	(original)
+++ Prophet/branches/moose/lib/Prophet/ChangeSet.pm	Sat May 17 04:10:50 2008
@@ -95,7 +95,7 @@
 }
 
 our @SERIALIZE_PROPS
-    = (qw(sequence_no source_uuid original_source_uuid original_sequence_no is_nullification is_resolution is_empty));
+    = (qw(sequence_no source_uuid original_source_uuid original_sequence_no is_nullification is_resolution));
 
 sub as_hash {
     my $self = shift;

Modified: Prophet/branches/moose/t/real-conflicting-merge.t
==============================================================================
--- Prophet/branches/moose/t/real-conflicting-merge.t	(original)
+++ Prophet/branches/moose/t/real-conflicting-merge.t	Sat May 17 04:10:50 2008
@@ -160,7 +160,6 @@
                         }
                     }
                 },
-                is_empty             => 0,
                 is_nullification     => 1,
                 is_resolution        => undef,
                 sequence_no          => ( replica_last_rev() - 2 ),
@@ -168,7 +167,7 @@
                 source_uuid          => replica_uuid(),
                 original_source_uuid => replica_uuid(),
             },
-            {   is_empty             => 0,
+            {
                 is_nullification     => undef,
                 is_resolution        => undef,
                 sequence_no          => ( replica_last_rev() - 1 ),
@@ -201,7 +200,7 @@
                 }
             },
 
-            {   is_empty             => 0,
+            {
                 is_nullification     => undef,
                 is_resolution        => 1,
                 sequence_no          => replica_last_rev(),

Modified: Prophet/branches/moose/t/simple-conflicting-merge.t
==============================================================================
--- Prophet/branches/moose/t/simple-conflicting-merge.t	(original)
+++ Prophet/branches/moose/t/simple-conflicting-merge.t	Sat May 17 04:10:50 2008
@@ -105,7 +105,6 @@
         $null_as_hash,
         {
 
-            is_empty             => 0,
             is_nullification     => 1,
             is_resolution        => undef,
             original_sequence_no => undef,
@@ -143,7 +142,7 @@
     $from_alice_as_hash->{$_} = undef for qw(sequence_no source_uuid);
     is_deeply(
         $from_alice_as_hash,
-        {   is_empty             => 0,
+        {
             is_nullification     => undef,
             is_resolution        => undef,
             source_uuid          => undef,

Modified: Prophet/branches/moose/t/simple-push.t
==============================================================================
--- Prophet/branches/moose/t/simple-push.t	(original)
+++ Prophet/branches/moose/t/simple-push.t	Sat May 17 04:10:50 2008
@@ -69,7 +69,6 @@
                 }
             },
             'is_nullification' => undef,
-            'is_empty'         => 0
         }
     ]
 );
@@ -123,7 +122,6 @@
                 }
             },
             'is_nullification' => undef,
-            'is_empty'         => 0
         }
     ]
 );