[Bps-public-commit] r11420 - in SVN-PropDB/lib/Prophet/Sync: Source

[clkao at bestpractical.com]

Author: clkao
Date: Thu Apr  3 01:53:41 2008
New Revision: 11420

Modified:
   SVN-PropDB/lib/Prophet/Sync/Source.pm
   SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm

Log:
the new_changesets_for logic.

Modified: SVN-PropDB/lib/Prophet/Sync/Source.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Sync/Source.pm	(original)
+++ SVN-PropDB/lib/Prophet/Sync/Source.pm	Thu Apr  3 01:53:41 2008
@@ -69,8 +69,8 @@
 
     for my $changeset (@$changesets_to_integrate) {
 
-        next if ( $self->has_seen_changeset($changeset) );
         next if $changeset->is_nullification || $changeset->is_resolution;
+        next if ( $self->has_seen_changeset($changeset) );
         $self->integrate_changeset(
             changeset         => $changeset,
             conflict_callback => $args{conflict_callback},
@@ -247,10 +247,6 @@
     ];
 }
 
-
-
-
-
 sub fetch_resolutions {
     my $self = shift;
     my %args = validate(

Modified: SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm	(original)
+++ SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm	Thu Apr  3 01:53:41 2008
@@ -179,8 +179,13 @@
     my ($self, $other) = @_;
 
     my $since = $other->last_changeset_from_source( $self->uuid );
-    warn $since;
-    $self->fetch_changesets( after => $since );
+
+    return [
+        grep { !( $_->is_nullification || $_->is_resolution )
+                && !$other->has_seen_changeset($_)
+            } @{ $self->fetch_changesets( after => $since ) }
+    ];
+
 }