[haver-commits] r813 - in trunk: . perl/core/lib/Haver

[haver]

Author: dylan
Date: 2005-06-24 22:08:34 -0400 (Fri, 24 Jun 2005)
New Revision: 813

Modified:
   trunk/
   trunk/perl/core/lib/Haver/Config.pm
Log:
 [EMAIL PROTECTED]:  dylan | 2005-06-24 22:08:28 -0400
 fixing _merge_array that bad way. Basically it does not merge;
 instead it chooses the newer version of the array.
 



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1168
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
   + 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1172
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238

Modified: trunk/perl/core/lib/Haver/Config.pm
===================================================================
--- trunk/perl/core/lib/Haver/Config.pm 2005-06-25 02:04:32 UTC (rev 812)
+++ trunk/perl/core/lib/Haver/Config.pm 2005-06-25 02:08:34 UTC (rev 813)
@@ -101,7 +101,7 @@
     croak '_merge_array($a, $b): $a and $b must be arrays!'
         unless reftype($_[0]) eq 'ARRAY' and reftype($_[1]) eq 'ARRAY';
        my ($left, $right) = @_;
-       return [EMAIL PROTECTED], @$right];
+       return [EMAIL PROTECTED];
 }
 
 1;