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

Reply

Author sunny256
Full name Øyvind A. Holm
Date 2007-04-07 06:10:53 PDT
Message User: sunny256
Date: 2007-04-07 06:10:53-0700
Log:
 r197 | sunny256 | 2007-04-03 11:45:43 +0000 (Tue, 03 Apr 2007) | 3 lines
 
 * /trunk/src/mergesvn
   Added the "-l"/"--log" option.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.18​&r2=1.19
Delta lines: +24 -4
--------------------
--- mergesvn 2007-04-07 06:10:01-0700 1.18
+++ mergesvn 2007-04-07 06:10:51-0700 1.19
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 196 2007-04-02 23:11:44Z sunny256 $
+# $Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -25,6 +25,7 @@
     'diff' => 0,
     'dry-run' => 0,
     'help' => 0,
+ 'log' => 0,
     'set' => "",
     'to' => "HEAD",
     'version' => 0,
@@ -33,7 +34,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 196 2007-04-02 23:11:44Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -45,6 +46,7 @@
     "diff|d" => \$Opt{'diff'},
     "dry-run" => \$Opt{'dry-run'},
     "help|h" => \$Opt{'help'},
+ "log|l" => \$Opt{'log'},
     "set|s=s" => \$Opt{'set'},
     "to|t=s" => \$Opt{'to'},
     "version" => \$Opt{'version'},
@@ -111,6 +113,10 @@
                 );
                 next LOOP;
             }
+ if ($Opt{'log'}) {
+ log_range($master_file, $last_merge + 1, $curr_rev);
+ next LOOP;
+ }
             if ($Opt{'dry-run'}) {
                 mysyst(
                     $CMD_SVN, "merge", "-r$last_merge:$curr_rev",
@@ -333,6 +339,14 @@
     # }}}
 } # escape_filename()
 
+sub log_range {
+ # Show a revision log of the specified range {{{
+ my ($File, $Start, $End) = @_;
+
+ mysyst($CMD_SVN, "log", "-r$Start:$End", $File);
+ # }}}
+}
+
 sub deb_wait {
     # Wait until Enter is pressed if --debug {{{
     $Debug || return;
@@ -382,6 +396,8 @@
     merge will result in conflicts.
   -h, --help
     Show this help.
+ -l, --log
+ Show a revision log of the remaining merges.
   -s x[\@y], --set x[\@y]
     Set merge source for all filenames on the command line. If \@y is
     specified, revision y will be used as the merge source, otherwise
@@ -424,7 +440,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 196 2007-04-02 23:11:44Z sunny256 $
+$Id: mergesvn 197 2007-04-03 11:45:43Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -482,6 +498,10 @@
 
 Print a brief help summary.
 
+=item B<-l>, B<--log>
+
+Show a revision log of the remaining merges.
+
 =item B<-s>, B<--set> I<x>[@I<y>]
 
 Set merge source for all filenames on the command line.
@@ -548,4 +568,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 196 2007-04-02 23:11:44Z sunny256 $
+# End of file $Id: mergesvn 197 2007-04-03 11:45:43Z 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:10:53 PDT
Messages per page: