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-04-01 22:39:46 PST
Message User: sunny256
Date: 05/04/01 22:39:46

Modified:
 /svnutils/trunk/src/
  svndiff

Log:
 r110 | sunny256 | 2005-04-02 04:37:24 +0000 (Sat, 02 Apr 2005) | 3 lines
 
 * /trunk/src/svndiff
   (diff_file): Tweak a debugging message.

File Changes:

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

File [changed]: svndiff
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​svndiff?r1=1.11&​r2=1.12
Delta lines: +4 -4
-------------------
--- svndiff 19 Feb 2005 20:18:13 -0000 1.11
+++ svndiff 2 Apr 2005 06:39:46 -0000 1.12
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: svndiff 99 2005-02-19 20:15:11Z sunny256 $
+# $Id: svndiff 110 2005-04-02 04:37:24Z sunny256 $
 # Uses a specified diff program for viewing differences in a Subversion
 # versioned directory tree.
 #
@@ -94,7 +94,7 @@
     my $Path = "";
     my $File = $File1;
 
- D("diff_file(\"$File1\");\n");
+ D("diff_file(\"$File1\", \"$has_conflict\");\n");
 
     if ($File =~ m#^(.*/)(.+?)$#) {
         $Path = $1;
@@ -177,7 +177,7 @@
 
 =head1 REVISION
 
-$Id: svndiff 99 2005-02-19 20:15:11Z sunny256 $
+$Id: svndiff 110 2005-04-02 04:37:24Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -250,4 +250,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: svndiff 99 2005-02-19 20:15:11Z sunny256 $
+# End of file $Id: svndiff 110 2005-04-02 04:37:24Z sunny256 $




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@svnu​tils.tigris.org
For additional commands, e-mail: cvs-help at svnutils dot tigris dot org

« 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-04-01 22:39:46 PST
Messages per page: