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 2008-09-20 22:52:55 PDT
Message User: sunny256
Date: 2008-09-20 22:52:55-0700
Log:
 r209 | sunny256 | 2008-09-17 19:34:44 +0000 (Wed, 17 Sep 2008) | 5 lines
 
 * /trunk/src/mergesvn
   Send various messages to stderr instead of stdout to avoid pollution.
 
 a8b7275c-84ef-11dd-8​05c-000475e441b9
 7dfebe9e-87a1-11dd-b​212-000475e441b9

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.23​&r2=1.24
Delta lines: +17 -17
---------------------
--- mergesvn 2007-04-07 06:17:21-0700 1.23
+++ mergesvn 2008-09-20 22:52:53-0700 1.24
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 208 2007-04-06 18:47:22Z sunny256 $
+# $Id: mergesvn 209 2008-09-17 19:34:44Z 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 208 2007-04-06 18:47:22Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 209 2008-09-17 19:34:44Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -117,7 +117,7 @@
             }
             if ($Opt{'log'}) {
                 if ($last_merge == $curr_rev) {
- print("No revisions found\n");
+ print(STDERR "No revisions found\n");
                 } else {
                     log_range($master_file, $last_merge + 1, $curr_rev);
                 }
@@ -136,7 +136,7 @@
                 );
             }
             push(@new_prop, "$curr_rev $orig_master");
- print(
+ print(STDERR
                 "$progname: $File: Merged r$last_merge:$curr_rev (" .
                 join(", ", revisions($master_file, $last_merge, $curr_rev)) .
                 ")\n"
@@ -204,17 +204,17 @@
     my ($Src, $Dest, $Start, $End) = @_;
 
     D("find_conflict('$Src', '$Dest', '$Start', '$End')");
- print("$progname: $Dest: Scanning revision range r$Start:$End " .
+ print(STDERR "$progname: $Dest: Scanning revision range r$Start:$End " .
           "for conflicts\n");
     my @Array = revisions($Src, $Start, $End);
     if (!scalar(@Array)) {
- print("No revisions found.\n");
+ print(STDERR "No revisions found.\n");
         return undef;
     }
 
     my $rev_count = scalar(@Array);
- printf("$rev_count revision%s to check\n", $rev_count == 1 ? "" : "s");
- print("(" . join(", ", @Array) . ")\n");
+ printf(STDERR "$rev_count revision%s to check\n", $rev_count == 1 ? "" : "s");
+ print(STDERR "(" . join(", ", @Array) . ")\n");
 
     my $min_block = 0;
     my ($min_pos, $max_pos) = (0, $rev_count);
@@ -228,16 +228,16 @@
         my $mid_pos = int(($min_pos + $max_pos) / 2);
         last if ($has_checked && ($mid_pos == $last_mid));
         my $Rev = $Array[$mid_pos];
- print("Checking revision $Rev ($mid_pos)...");
+ print(STDERR "Checking revision $Rev ($mid_pos)...");
         if (!has_conflict($Src, $Dest, $Start, $Rev)) {
- print("No conflict\n");
+ print(STDERR "No conflict\n");
             $min_pos = $mid_pos;
             D("min_pos set to '$mid_pos'");
             if (!$last_good || ($Rev > $last_good)) {
                 $last_good = $Rev;
             }
         } else {
- print("Conflict\n");
+ print(STDERR "Conflict\n");
             $max_pos = $mid_pos;
             D("max_pos set to '$mid_pos'");
             if (!$first_conflict || ($Rev < $first_conflict)) {
@@ -247,11 +247,11 @@
         $has_checked = 1;
         $last_mid = $mid_pos;
     }
- print($first_conflict
+ print(STDERR $first_conflict
         ? "First conflict at r$first_conflict. "
         : "No conflicts found. "
     );
- print($last_good
+ print(STDERR $last_good
         ? "Last revision without conflict at r$last_good.\n"
         : "No revisions without conflicts found.\n"
     );
@@ -329,7 +329,7 @@
     my $system_txt = sprintf("system(\"%s\");", join("\", \"", @Args));
     D("$system_txt");
     deb_wait();
- print("---- @_\n");
+ print(STDERR "---- @_\n");
     system(@_);
     # }}}
 } # mysyst()
@@ -362,7 +362,7 @@
 sub deb_wait {
     # Wait until Enter is pressed if --debug {{{
     $Debug || return;
- print("debug: Press ENTER...");
+ print(STDERR "debug: Press ENTER...");
     <STDIN>;
     # }}}
 } # deb_wait()
@@ -464,7 +464,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 208 2007-04-06 18:47:22Z sunny256 $
+$Id: mergesvn 209 2008-09-17 19:34:44Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -600,4 +600,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=0 et fo+=w :
-# End of file $Id: mergesvn 208 2007-04-06 18:47:22Z sunny256 $
+# End of file $Id: mergesvn 209 2008-09-17 19:34:44Z 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:52:55 PDT
Messages per page: