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-05 08:46:14 PST
Message User: sunny256
Date: 2007-03-05 08:46:14-0800
Log:
 r187 | sunny256 | 2007-03-05 16:38:47 +0000 (Mon, 05 Mar 2007) | 3 lines
 
 * /trunk/src/mergesvn
   Print a status message after the merge with all revisions listed.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.12​&r2=1.13
Delta lines: +9 -4
-------------------
--- mergesvn 2007-03-05 08:45:49-0800 1.12
+++ mergesvn 2007-03-05 08:46:11-0800 1.13
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 186 2007-03-05 16:35:47Z sunny256 $
+# $Id: mergesvn 187 2007-03-05 16:38:47Z sunny256 $
 # 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 186 2007-03-05 16:35:47Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 187 2007-03-05 16:38:47Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -118,6 +118,11 @@
                 );
             }
             push(@new_prop, "$curr_rev $orig_master");
+ print(
+ "$progname: $File: Merged r$last_merge:$curr_rev (" .
+ join(", ", revisions($master_file, $last_merge, $curr_rev)) .
+ ")\n"
+ );
         } else {
             warn("$File: \"$Curr\": Invalid property line\n");
             next LOOP;
@@ -361,7 +366,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 186 2007-03-05 16:35:47Z sunny256 $
+$Id: mergesvn 187 2007-03-05 16:38:47Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -477,4 +482,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 186 2007-03-05 16:35:47Z sunny256 $
+# End of file $Id: mergesvn 187 2007-03-05 16:38:47Z 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 2007-03-05 08:46:14 PST
Messages per page: