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-04-07 06:12:11 PDT
Message User: sunny256
Date: 2007-04-07 06:12:11-0700
Log:
 r199 | sunny256 | 2007-04-03 13:23:05 +0000 (Tue, 03 Apr 2007) | 6 lines
 
 $ mergesvn mergesvn
 
 * /trunk/src/mergesvn
   Updated by mergesvn. The "-v"/"--verbose" option got added + POD
   change.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.20​&r2=1.21
Delta lines: +24 -6
--------------------
--- mergesvn 2007-04-07 06:11:33-0700 1.20
+++ mergesvn 2007-04-07 06:12:09-0700 1.21
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $
+# $Id: mergesvn 199 2007-04-03 13:23:05Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -28,13 +28,14 @@
     'log' => 0,
     'set' => "",
     'to' => "HEAD",
+ 'verbose' => 0,
     'version' => 0,
 );
 
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 199 2007-04-03 13:23:05Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -49,6 +50,7 @@
     "log|l" => \$Opt{'log'},
     "set|s=s" => \$Opt{'set'},
     "to|t=s" => \$Opt{'to'},
+ "verbose|v+" => \$Opt{'verbose'},
     "version" => \$Opt{'version'},
 ) || die("$progname: Option error. Use -h for help.\n");
 
@@ -407,6 +409,8 @@
     revision the source changed.
   -t x, --to x
     Merge to revision x instead of HEAD.
+ -v, --verbose
+ Increase level of verbosity. Can be repeated.
   --version
     Print version information.
   --debug
@@ -417,6 +421,16 @@
     # }}}
 } # usage()
 
+sub msg {
+ # Print a status message to stderr based on verbosity level {{{
+ my ($verbose_level, $Txt) = @_;
+
+ if ($Opt{'verbose'} >= $verbose_level) {
+ print(STDERR "$progname: $Txt\n");
+ }
+ # }}}
+} # msg()
+
 sub D {
     # Print a debugging message if --debug {{{
     $Debug || return;
@@ -442,7 +456,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $
+$Id: mergesvn 199 2007-04-03 13:23:05Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -516,6 +530,10 @@
 
 Merge to revision I<x> instead of HEAD.
 
+=item B<-v>, B<--verbose>
+
+Increase level of verbosity. Can be repeated.
+
 =item B<--version>
 
 Print version information.
@@ -542,7 +560,7 @@
 
 =head1 COPYRIGHT
 
-Copyleft © Øyvind A. Holm &lt;sunny@sunbas​e.org&gt;
+Copyleft © Øyvind A. Holm E<lt>sunny@sun​base.orgE<gt>
 This is free software; see the file F<COPYING> for legalese stuff.
 
 =head1 LICENCE
@@ -569,5 +587,5 @@
 
 # }}}
 
-# vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 198 2007-04-03 11:52:37Z sunny256 $
+# vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=0 et fo+=w :
+# End of file $Id: mergesvn 199 2007-04-03 13:23:05Z 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-04-07 06:12:11 PDT
Messages per page: