[Bps-public-commit] Prophet branch, master, updated. d220860878ff7e9b4331171b5477b490cda89eeb

[jesse]

The branch, master has been updated
       via  d220860878ff7e9b4331171b5477b490cda89eeb (commit)
      from  0598b0a322418b7f930ad870c57e5ac3a819b83e (commit)

Summary of changes:
 lib/Prophet/CLI/Command/Merge.pm |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit d220860878ff7e9b4331171b5477b490cda89eeb
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Jun 10 11:10:05 2009 -0400

    fix merge --dry-run

diff --git a/lib/Prophet/CLI/Command/Merge.pm b/lib/Prophet/CLI/Command/Merge.pm
index 552c29e..f11bb71 100644
--- a/lib/Prophet/CLI/Command/Merge.pm
+++ b/lib/Prophet/CLI/Command/Merge.pm
@@ -96,10 +96,11 @@ sub _do_merge {
         $self->source->traverse_changesets(
             after    => $last_seen_from_source,
             before_load_changeset_callback  => sub { 
-                my $data = shift;
+                my %args = (@_);
+                my $data = $args{changeset_metadata};
                 my ($seq, $orig_uuid, $orig_seq, $key) = @$data;
                 # skip changesets we've seen before
-                if ( $self->has_seen_changeset( source_uuid => $orig_uuid, sequence_no => $orig_seq) ){
+                if ( $self->target->has_seen_changeset( source_uuid => $orig_uuid, sequence_no => $orig_seq) ){
                         return undef;
                 } else {
                     return 1;

-----------------------------------------------------------------------