Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /svnutils/trunk/src/

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/

Author sunny256
Full name Øyvind A. Holm
Date 2005-07-19 12:00:57 PDT
Message User: sunny256
Date: 2005/07/19 12:00:57

Modified:
   svnutils/trunk/src/svndiff

Log:
 r146 | sunny256 | 2005-07-19 02:17:21 +0000 (Tue, 19 Jul 2005) | 6 lines
 
 Bah. The conflict test in svndiff lacked a ^ in the regexp, so the
 program thought files with a capital C in the filename had a conflict.
 
 * /trunk/src/svndiff
   Add the missing ^ to two regexps.

File Changes:

Directory: /svnutils/trunk/src/
===============================

File [changed]: svndiff
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​svndiff?r1=1.33&​r2=1.34
Delta lines: +5 -5
-------------------
--- svndiff 16 May 2005 15:10:16 -0000 1.33
+++ svndiff 19 Jul 2005 19:00:54 -0000 1.34
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: svndiff 144 2005-05-16 15:06:45Z sunny256 $
+# $Id: svndiff 146 2005-07-19 02:17:21Z sunny256 $
 # Uses a specified diff program for viewing differences in a Subversion
 # versioned directory tree.
 #
@@ -117,7 +117,7 @@
             if (!is_url($Curr)) {
                 D("Before PipeFP 1: CMD_SVN = \"$CMD_SVN\"");
                 if (open(PipeFP, "$CMD_SVN stat $Curr -q |")) {
- $has_conflict = (<PipeFP> =~ /$ST_CONFLICT/) ? 1 : 0;
+ $has_conflict = (<PipeFP> =~ /^$ST_CONFLICT/) ? 1 : 0;
                 } else {
                     warn("$progname: Error opening " .
                          "\"$CMD_SVN $Curr stat -q\" pipe: $!");
@@ -151,7 +151,7 @@
                    ( $1, $2);
                 D("\$Stat = \"$Stat\", \$File = \"$File\"\n");
                 push(@mod_array, $File);
- $has_conflict{$File} = ($Stat =~ /$ST_CONFLICT/) ? 1 : 0;
+ $has_conflict{$File} = ($Stat =~ /^$ST_CONFLICT/) ? 1 : 0;
                 D("\$has_conflict{$File} = \"$has_conflict{$File}\"\n");
             }
         }
@@ -504,7 +504,7 @@
 
 =head1 REVISION
 
-$Id: svndiff 144 2005-05-16 15:06:45Z sunny256 $
+$Id: svndiff 146 2005-07-19 02:17:21Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -683,4 +683,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: svndiff 144 2005-05-16 15:06:45Z sunny256 $
+# End of file $Id: svndiff 146 2005-07-19 02:17:21Z sunny256 $

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/ sunny256 Øyvind A. Holm 2005-07-19 12:00:57 PDT
Messages per page: