[Bps-public-commit] r15623 - in Prophet/trunk: .

[jesse at bestpractical.com]

Author: jesse
Date: Thu Aug 28 21:16:28 2008
New Revision: 15623

Modified:
   Prophet/trunk/   (props changed)
   Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm

Log:
 r44648 at 68-246-110-196 (orig r15571):  jesse | 2008-08-27 18:18:19 -0700
  r44634 at 192:  jesse | 2008-08-27 16:23:44 -0700
  * silence some warnings in history walking
 


Modified: Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	(original)
+++ Prophet/trunk/lib/Prophet/CLI/Command/Merge.pm	Thu Aug 28 21:16:28 2008
@@ -84,8 +84,8 @@
 
     my $changesets = 0;
 
-    my $source_latest = $source->latest_sequence_no();
-    my $source_last_seen = $target->last_changeset_from_source($source->uuid);
+    my $source_latest = $source->latest_sequence_no() || 0;
+    my $source_last_seen = $target->last_changeset_from_source($source->uuid) || 0;
 
     if( $self->has_arg('verbose') ) {
         print "Integrating changes from ".$source_last_seen . " to ". $source_latest."\n";