Login | Register
My pages Projects Community openCollabNet

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

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/mergesvn

Reply

Author sunny256
Full name Øyvind A. Holm
Date 2008-09-20 22:54:57 PDT
Message User: sunny256
Date: 2008-09-20 22:54:57-0700
Log:
 r210 | sunny256 | 2008-09-17 19:44:57 +0000 (Wed, 17 Sep 2008) | 6 lines
 
 * /trunk/src/mergesvn
   (find_conflict): Add more information to the progress message made by
     -C and start counting at 1 instead of 0.
 
 e90e32fe-84f0-11dd-a​e57-000475e441b9
 c7d113aa-87a1-11dd-9​ad2-000475e441b9

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.24​&r2=1.25
Delta lines: +6 -5
-------------------
--- mergesvn 2008-09-20 22:52:53-0700 1.24
+++ mergesvn 2008-09-20 22:54:54-0700 1.25
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 209 2008-09-17 19:34:44Z sunny256 $
+# $Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -35,7 +35,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 209 2008-09-17 19:34:44Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -228,7 +228,8 @@
         my $mid_pos = int(($min_pos + $max_pos) / 2);
         last if ($has_checked && ($mid_pos == $last_mid));
         my $Rev = $Array[$mid_pos];
- print(STDERR "Checking revision $Rev ($mid_pos)...");
+ printf(STDERR "Checking revision %lu (%lu/%lu)...",
+ $Rev, $mid_pos + 1, $rev_count);
         if (!has_conflict($Src, $Dest, $Start, $Rev)) {
             print(STDERR "No conflict\n");
             $min_pos = $mid_pos;
@@ -464,7 +465,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 209 2008-09-17 19:34:44Z sunny256 $
+$Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -600,4 +601,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=0 et fo+=w :
-# End of file $Id: mergesvn 209 2008-09-17 19:34:44Z sunny256 $
+# End of file $Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $

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

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/mergesvn sunny256 Øyvind A. Holm 2008-09-20 22:54:57 PDT
Messages per page: