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-03-05 08:45:15 PST
Message User: sunny256
Date: 2007-03-05 08:45:15-0800
Log:
 r185 | sunny256 | 2007-03-05 11:00:31 +0000 (Mon, 05 Mar 2007) | 4 lines
 
 * /trunk/src/mergesvn
   Don’t run svn update before merging, let the user take care of that.
   And it could be situations that it’s unwanted behaviour anyway.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.10​&r2=1.11
Delta lines: +4 -7
-------------------
--- mergesvn 2007-03-05 08:44:11-0800 1.10
+++ mergesvn 2007-03-05 08:45:12-0800 1.11
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 183 2007-03-04 15:38:04Z sunny256 $
+# $Id: mergesvn 185 2007-03-05 11:00:31Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -31,7 +31,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 183 2007-03-04 15:38:04Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 185 2007-03-05 11:00:31Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -84,9 +84,6 @@
             my $master_file = length($Opt{'alias'})
                                 ? $Opt{'alias'}
                                 : $orig_master;
- if (!$Opt{'diff'} && !$Opt{'dry-run'}) {
- mysyst($CMD_SVN, "update", $File);
- }
             my $curr_rev = highest_revision($master_file, $Opt{'to'});
             if ($curr_rev !~ /^\d+$/) {
                 warn("$progname: $master_file: " .
@@ -251,7 +248,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 183 2007-03-04 15:38:04Z sunny256 $
+$Id: mergesvn 185 2007-03-05 11:00:31Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -359,4 +356,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 183 2007-03-04 15:38:04Z sunny256 $
+# End of file $Id: mergesvn 185 2007-03-05 11:00:31Z 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-03-05 08:45:15 PST
Messages per page: