resolve merge conflict

diff --git a/Changes b/Changes
index 0e84534de5faf150deb7907569c92b6ecb82353c..b9f762315e295ac3f08037496f0685442851b87c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for DBIx-Class-RecursivePUT
 
+0.009  Sat Jun 20 16:37:57 CEST 2009
+       if_not_submitted flag (experimental)
+
 0.006  Fri May 15 11:03:48 CEST 2009
        Some adjustments for HTML::FormHandler
 

diff --git a/META.yml b/META.yml
index 510f9d67e8d4999e60a2c10a8d2f93fe565601da..cc7fdf4724386f7a497bbfbba7f8cdcd6f6bf2f5 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,8 +1,8 @@
 --- #YAML:1.0
-name:               DBIx-Class-ResultSet-RecursiveUpdate
-version:            v0.008
-abstract:           like update_or_create - but recursive
-author:
+name:                DBIx-Class-ResultSet-RecursiveUpdate
+version:             0.0.9
+abstract:            like update_or_create - but recursive 
+author:              
     - Zbigniew Lukasiak <zby@cpan.org>
 license:            perl
 distribution_type:  module

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 90f5994d5d419a0b46b9dd0cc5a7a3cc32701e49..8bd85f776896194b91cbb093dcea445e4754b676 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 package DBIx::Class::ResultSet::RecursiveUpdate;
 
-use version; our $VERSION = qv('0.008');
+use version; our $VERSION = qv('0.009');
 
 use base qw(DBIx::Class::ResultSet);
 

diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm
index 8e5afa8e3bc0e83b01aa125ea8497345140cceff..f391fc6e390de1d493615383dca94f4320994305 100644 (file)
--- a/t/lib/RunTests.pm
+++ b/t/lib/RunTests.pm
@@ -113,7 +113,7 @@ sub run_tests{
             { dvd_name => $dvd->name, key2 => 1 }
             ],
     };
-    my $dvd_updated = $dvd_rs->recursive_update( $updates );
+    $dvd_updated = $dvd_rs->recursive_update( $updates );
     ok ( $schema->resultset( 'Twokeys' )->find( { dvd_name => 'New Test Name', key2 => 1 } ), 'Twokeys updated' );
     ok ( !$schema->resultset( 'Twokeys' )->find( { dvd_name => $dvd->name, key2 => 1 } ), 'Twokeys updated' );
  

diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db
index 08a30ef83cc1b6f61e6d85dbebafd87da9af68b5..2e13de1e5c4ca7b30229b87ae06979e0bc8f706d 100644 (file)
Binary files a/t/var/dvdzbr.db and b/t/var/dvdzbr.db differ