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

Author sunny256
Full name Øyvind A. Holm
Date 2007-03-12 01:18:14 PDT
Message User: sunny256
Date: 2007-03-12 01:18:14-0700
Log:
 r191 | sunny256 | 2007-03-11 14:24:54 +0000 (Sun, 11 Mar 2007) | 4 lines
 
 * /trunk/src/mergesvn
   (find_conflict): Bugfix. If there was only one revision to check,
     find_conflict() was skipped.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.14​&r2=1.15
Delta lines: +7 -5
-------------------
--- mergesvn 2007-03-08 04:09:07-0700 1.14
+++ mergesvn 2007-03-12 01:18:11-0700 1.15
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 189 2007-03-08 11:06:16Z sunny256 $
+# $Id: mergesvn 191 2007-03-11 14:24:54Z sunny $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -32,7 +32,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 189 2007-03-08 11:06:16Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 191 2007-03-11 14:24:54Z sunny $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -158,10 +158,11 @@
     my $last_mid = 0;
     my $first_conflict = 0;
     my $last_good = 0;
+ my $has_checked = 0;
 
     while (1) {
         my $mid_pos = int(($min_pos + $max_pos) / 2);
- last if ($mid_pos == $last_mid);
+ last if ($has_checked && ($mid_pos == $last_mid));
         my $Rev = $Array[$mid_pos];
         print("Checking revision $Rev ($mid_pos)...");
         if (!has_conflict($Src, $Dest, $Start, $Rev)) {
@@ -179,6 +180,7 @@
                 $first_conflict = $Rev;
             }
         }
+ $has_checked = 1;
         $last_mid = $mid_pos;
     }
     print($first_conflict
@@ -366,7 +368,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 189 2007-03-08 11:06:16Z sunny256 $
+$Id: mergesvn 191 2007-03-11 14:24:54Z sunny $
 
 =head1 SYNOPSIS
 
@@ -482,4 +484,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 189 2007-03-08 11:06:16Z sunny256 $
+# End of file $Id: mergesvn 191 2007-03-11 14:24:54Z sunny $

« 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 2007-03-12 01:18:14 PDT
Messages per page: