[Bps-public-commit] r11375 - in SVN-PropDB: . lib/Prophet lib/Prophet/Resolver

[jesse at bestpractical.com]

Author: jesse
Date: Tue Apr  1 23:33:46 2008
New Revision: 11375

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/lib/Prophet/Handle.pm
   SVN-PropDB/lib/Prophet/Resolver/AlwaysTarget.pm
   SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm

Log:
 r28961 at 70-5-79-205:  jesse | 2008-04-01 17:33:23 -1000
 * More correct merge tickets
 


Modified: SVN-PropDB/lib/Prophet/Handle.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Handle.pm	(original)
+++ SVN-PropDB/lib/Prophet/Handle.pm	Tue Apr  1 23:33:46 2008
@@ -404,12 +404,8 @@
     my $self = shift;
     my ($changeset) = validate_pos( @_, { isa => 'Prophet::ChangeSet' } );
 
-    # Record a merge ticket for the changeset's "direct" source
-    $self->_record_merge_ticket( $changeset->source_uuid, $changeset->sequence_no );
-
     # Record a merge ticket for the changeset's "original" source
-    $self->_record_merge_ticket( $changeset->original_source_uuid, $changeset->original_sequence_no )
-        if ( $changeset->original_source_uuid && $changeset->original_source_uuid ne $changeset->source_uuid );
+    $self->_record_merge_ticket( $changeset->original_source_uuid, $changeset->original_sequence_no );
 
 }
 

Modified: SVN-PropDB/lib/Prophet/Resolver/AlwaysTarget.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Resolver/AlwaysTarget.pm	(original)
+++ SVN-PropDB/lib/Prophet/Resolver/AlwaysTarget.pm	Tue Apr  1 23:33:46 2008
@@ -8,6 +8,7 @@
 sub run {
     my $self               = shift;
     my $conflicting_change = shift;
+    my $conflict = shift;
     my $resolution         = Prophet::Change->new_from_conflict($conflicting_change);
     if ( $conflicting_change->file_op_conflict eq 'update_missing_file' ) {
         $resolution->change_type('delete');
@@ -15,7 +16,7 @@
     } elsif ( $conflicting_change->file_op_conflict eq 'delete_missing_file' ) {
         return $resolution;
     } elsif ( $conflicting_change->file_op_conflict ) {
-        die YAML::Dump($conflicting_change);
+        die YAML::Dump($conflict, $conflicting_change);
     }
 
     for my $prop_change ( @{ $conflicting_change->prop_conflicts } ) {

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	Tue Apr  1 23:33:46 2008
@@ -171,11 +171,10 @@
     # If the changeset originated locally, we never want it
     return 1 if $changeset->original_source_uuid eq $self->uuid;
     # Otherwise, if the we have a merge ticket from the source, we don't want the changeset
-    my $last = $self->last_changeset_from_source( $changeset->original_source_uuid || $changeset->source_uuid );
-        
+    my $last = $self->last_changeset_from_source( $changeset->original_source_uuid);
     # if the source's sequence # is >= the changeset's sequence #, we can safely skip it
     return 1 if ( $last >= $changeset->original_sequence_no );
-
+    return undef;
 }