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:17:24 PDT
Message User: sunny256
Date: 2007-04-07 06:17:24-0700
Log:
 r208 | sunny256 | 2007-04-06 18:47:22 +0000 (Fri, 06 Apr 2007) | 5 lines
 
 * /trunk/src/mergesvn
   If the destination element was in sync with the source, the source log
   entry for the last sync point was showed when using --log. Don’t do
   that.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.22​&r2=1.23
Delta lines: +9 -5
-------------------
--- mergesvn 2007-04-07 06:12:34-0700 1.22
+++ mergesvn 2007-04-07 06:17:21-0700 1.23
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 200 2007-04-03 23:51:02Z sunny256 $
+# $Id: mergesvn 208 2007-04-06 18:47:22Z 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 200 2007-04-03 23:51:02Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 208 2007-04-06 18:47:22Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -116,7 +116,11 @@
                 next LOOP;
             }
             if ($Opt{'log'}) {
+ if ($last_merge == $curr_rev) {
+ print("No revisions found\n");
+ } else {
                 log_range($master_file, $last_merge + 1, $curr_rev);
+ }
                 next LOOP;
             }
             if ($Opt{'dry-run'}) {
@@ -460,7 +464,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 200 2007-04-03 23:51:02Z sunny256 $
+$Id: mergesvn 208 2007-04-06 18:47:22Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -596,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 200 2007-04-03 23:51:02Z sunny256 $
+# End of file $Id: mergesvn 208 2007-04-06 18:47:22Z 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:17:24 PDT
Messages per page: