1 #!/usr/bin/perl -w

     2 

     3 # Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.

     4 #

     5 # Redistribution and use in source and binary forms, with or without

     6 # modification, are permitted provided that the following conditions

     7 # are met:

     8 #

     9 # 1.  Redistributions of source code must retain the above copyright

    10 #     notice, this list of conditions and the following disclaimer. 

    11 # 2.  Redistributions in binary form must reproduce the above copyright

    12 #     notice, this list of conditions and the following disclaimer in the

    13 #     documentation and/or other materials provided with the distribution. 

    14 # 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of

    15 #     its contributors may be used to endorse or promote products derived

    16 #     from this software without specific prior written permission. 

    17 #

    18 # THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY

    19 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

    20 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

    21 # DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY

    22 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

    23 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

    24 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

    25 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

    26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

    27 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    28 

    29 use strict;

    30 

    31 # script to merge change log after svn-apply failed

    32 #

    33 # Should improve later to merge in all sorts of other cases too.

    34 

    35 open REG, "ChangeLog.rej" or die "Can't open ChangeLog.rej\n";

    36 open LOG, "ChangeLog" or die "Can't open ChangeLog\n";

    37 

    38 my $result;

    39 

    40 while (<REG>) {

    41     $result .= "$1\n" if /^\+ (.*)$/;

    42 }

    43 

    44 close REG;

    45 

    46 die "Nothing in ChangeLog.rej to merge\n" unless $result;

    47 

    48 while (<LOG>) {

    49     $result .= $_;

    50 }

    51 

    52 close LOG;

    53 

    54 open LOG, ">ChangeLog" or die "Can't write ChangeLog\n";

    55 print LOG $result;

    56 close LOG;

    57 

    58 unlink "ChangeLog.rej";

    59 unlink "ChangeLog.orig";