[Bps-public-commit] r11282 - in SVN-PropDB: . doc lib/Prophet t

[jesse at bestpractical.com]

Author: jesse
Date: Sun Mar 30 20:48:18 2008
New Revision: 11282

Added:
   SVN-PropDB/t/simple-conflicting-merge.t
      - copied unchanged from r11281, /SVN-PropDB/t/non-conflicting-merge.t
Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/doc/todo
   SVN-PropDB/lib/Prophet/Handle.pm
   SVN-PropDB/lib/Prophet/Sync/Source/SVN.pm

Log:
 r28817 at 70-5-79-37:  jesse | 2008-03-30 14:48:09 -1000
  new test files


Modified: SVN-PropDB/doc/todo
==============================================================================
--- SVN-PropDB/doc/todo	(original)
+++ SVN-PropDB/doc/todo	Sun Mar 30 20:48:18 2008
@@ -8,6 +8,8 @@
 - reuse conflict resolution data on repeated resolve
 - ability to 'pull' conflicting updates from a remote db
 - handle conflicting conflict resolutions
+
+
 - base bug tracking schema
 - Replace this todo list with a svb database
 - elegant support for large attachments

Modified: SVN-PropDB/lib/Prophet/Handle.pm
==============================================================================
--- SVN-PropDB/lib/Prophet/Handle.pm	(original)
+++ SVN-PropDB/lib/Prophet/Handle.pm	Sun Mar 30 20:48:18 2008
@@ -112,7 +112,6 @@
     my $self      = shift;
     my $changeset = shift;
 
-    warn "==> attmping to integrate changeset $changeset";
     $self->begin_edit();
     $self->_integrate_change($_) for ($changeset->changes);
     $self->_set_original_source_metadata($changeset);

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	Sun Mar 30 20:48:18 2008
@@ -17,6 +17,8 @@
 
 __PACKAGE__->mk_accessors(qw/url ra prophet_handle/);
 
+our $DEBUG = $Prophet::Handle::DEBUG;
+
 =head2 setup
 
 Open a connection to the SVN source identified by C<$self->url>.
@@ -60,7 +62,6 @@
 sub fetch_changesets {
     my $self = shift;
     my %args = validate( @_, { after => 1});
-warn "===> grabbing changesets after $args{after}";
     my @results;
     my $last_editor;
 
@@ -119,7 +120,7 @@
             $changeset->add_change( change => $change );
 
         } else {
-            warn "Discarding change to a non-record: $path";
+            warn "Discarding change to a non-record: $path" if $DEBUG;
         }
 
     }