fielding    97/06/26 14:15:11

  Modified:    .         log_accum.pl
  Log:
  Fixed the problem with diffing the first revision on a branch against
  the pre-branched file.
  
  Revision  Changes    Path
  1.28      +7 -0      CVSROOT/log_accum.pl
  
  Index: log_accum.pl
  ===================================================================
  RCS file: /export/home/cvs/CVSROOT/log_accum.pl,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -C3 -r1.27 -r1.28
  *** log_accum.pl      1997/06/26 16:32:19     1.27
  --- log_accum.pl      1997/06/26 21:15:10     1.28
  ***************
  *** 204,212 ****
  --- 204,219 ----
    
        $diff = "\n\n";
    
  +     #
  +     # Get the differences between this and the previous revision,
  +     # being aware that new files always have revision '1.1' and
  +     # new branches always end in '.n.1'.
  +     #
        if ($rev =~ /^(.*)\.([0-9]+)$/) {
            $prev = $2 - 1;
            $prev_rev = $1 . '.' .  $prev;
  + 
  +         $prev_rev =~ s/\.[0-9]+\.0$//;  # Truncate if first rev on branch
    
            if ($rev eq '1.1') {
                open(DIFF, "-|") || exec 'cvs', '-Qn', 'update', '-p',
  
  
  

Reply via email to