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:37 PDT
Message User: sunny256
Date: 2007-04-07 06:12:37-0700
Log:
 r200 | sunny256 | 2007-04-03 23:51:02 +0000 (Tue, 03 Apr 2007) | 4 lines
 
 * /trunk/src/mergesvn
   When -v is specified, it is used together with svn commands that
   accepts it. Only svn log at the moment.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.21​&r2=1.22
Delta lines: +14 -6
--------------------
--- mergesvn 2007-04-07 06:12:09-0700 1.21
+++ mergesvn 2007-04-07 06:12:34-0700 1.22
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 199 2007-04-03 13:23:05Z sunny256 $
+# $Id: mergesvn 200 2007-04-03 23:51:02Z 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 199 2007-04-03 13:23:05Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 200 2007-04-03 23:51:02Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -347,7 +347,11 @@
     # Show a revision log of the specified range {{{
     my ($File, $Start, $End) = @_;
 
+ if ($Opt{'verbose'}) {
+ mysyst($CMD_SVN, "log", "-r$Start:$End", "-v", $File);
+ } else {
     mysyst($CMD_SVN, "log", "-r$Start:$End", $File);
+ }
     # }}}
 } # log_range()
 
@@ -410,7 +414,7 @@
   -t x, --to x
     Merge to revision x instead of HEAD.
   -v, --verbose
- Increase level of verbosity. Can be repeated.
+ Use the -v option together with svn commands that accepts it.
   --version
     Print version information.
   --debug
@@ -456,7 +460,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 199 2007-04-03 13:23:05Z sunny256 $
+$Id: mergesvn 200 2007-04-03 23:51:02Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -538,6 +542,10 @@
 
 Print version information.
 
+=item B<-v>, B<--verbose>
+
+Use the -v option together with svn commands that accepts it.
+
 =item B<--debug>
 
 Print debugging messages.
@@ -588,4 +596,4 @@
 # }}}
 
 # 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 $
+# End of file $Id: mergesvn 200 2007-04-03 23:51:02Z 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:37 PDT
Messages per page: