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 2008-09-22 17:13:05 PDT
Message User: sunny256
Date: 2008-09-22 17:13:05-0700
Log:
 r212 | sunny256 | 2008-09-23 00:10:05 +0000 (Tue, 23 Sep 2008) | 5 lines
 
 * /trunk/src/mergesvn
   Don’t try to merge if there’s no new revisions available.
 
 ec2e99b2-8903-11dd-a​a10-000475e441b9 (svn)
 5a2dfc3c-8904-11dd-8​e8c-000475e441b9 (cvs)

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.25​&r2=1.26
Delta lines: +8 -4
-------------------
--- mergesvn 2008-09-20 22:54:54-0700 1.25
+++ mergesvn 2008-09-22 17:13:03-0700 1.26
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $
+# $Id: mergesvn 212 2008-09-23 00:10:05Z 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 210 2008-09-17 19:44:57Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 212 2008-09-23 00:10:05Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -130,6 +130,10 @@
                     $master_file, $File
                 );
             } else {
+ if ($last_merge == $curr_rev) {
+ print(STDERR "$progname: $File: No new revisions available (r$last_merge)\n");
+ next LOOP;
+ }
                 mysyst(
                     $CMD_SVN, "merge", "-r$last_merge:$curr_rev",
                     $master_file, $File
@@ -465,7 +469,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $
+$Id: mergesvn 212 2008-09-23 00:10:05Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -601,4 +605,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=0 et fo+=w :
-# End of file $Id: mergesvn 210 2008-09-17 19:44:57Z sunny256 $
+# End of file $Id: mergesvn 212 2008-09-23 00:10: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 2008-09-22 17:13:05 PDT
Messages per page: