[webkit-changes] cvs commit: WebKitTools/Scripts cvs-apply

[Darin]

darin       05/11/07 13:32:52

  Modified:    .        ChangeLog
               Scripts  cvs-apply
  Log:
          * Scripts/cvs-apply: Fix case where the patch has files at the top level.
  
  Revision  Changes    Path
  1.118     +4 -0      WebKitTools/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKitTools/ChangeLog,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- ChangeLog	3 Nov 2005 18:47:45 -0000	1.117
  +++ ChangeLog	7 Nov 2005 21:32:51 -0000	1.118
  @@ -1,3 +1,7 @@
  +2005-11-07  Darin Adler  <darin at apple.com>
  +
  +        * Scripts/cvs-apply: Fix case where the patch has files at the top level.
  +
   2005-11-03  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Darin.
  
  
  
  1.9       +4 -2      WebKitTools/Scripts/cvs-apply
  
  Index: cvs-apply
  ===================================================================
  RCS file: /cvs/root/WebKitTools/Scripts/cvs-apply,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- cvs-apply	10 Oct 2005 06:35:12 -0000	1.8
  +++ cvs-apply	7 Nov 2005 21:32:52 -0000	1.9
  @@ -86,9 +86,11 @@
   if ($merge) {
       for my $file (sort keys %versions) {
           print "Getting version $versions{$file} of $file\n";
  -        $file =~ m|^(([^/\n]*/)+)([^/\n]+)$| or die;
  +        $file =~ m|^(([^/\n]*/)*)([^/\n]+)$| or die;
           my ($prefix, $base) = ($1, $3);
  -        chdir $prefix;
  +        if ($prefix) {
  +            chdir $prefix or die;
  +        }
           system "cvs update -r $versions{$file} $base";
           chdir $startDir;
       }