From: Zbigniew Lukasiak <zby@zby.aster.net.pl>
Date: Sat, 20 Jun 2009 14:51:26 +0000 (+0200)
Subject: resolve merge conflict
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=7be1c91f301e7d86e95e9ea77be30a95bdcfe607;hp=2f7a45edba2d4e563e3afb50158e334e0ad89fb6;p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate

resolve merge conflict
---

diff --git a/Changes b/Changes
index 0e84534..b9f7623 100644
--- 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 510f9d6..cc7fdf4 100644
--- 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 90f5994..8bd85f7 100644
--- 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 8e5afa8..f391fc6 100644
--- 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 08a30ef..2e13de1 100644
Binary files a/t/var/dvdzbr.db and b/t/var/dvdzbr.db differ