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-02-20 04:33:16 PST
Message User: sunny256
Date: 2007-02-20 04:33:16-0800
Log:
 r174 | sunny256 | 2007-02-17 23:08:03 +0000 (Sat, 17 Feb 2007) | 3 lines
 
 * /trunk/src/mergesvn
   Regexp fix for stripping of DOS-style/multiple newlines.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.2&​r2=1.3
Delta lines: +5 -5
-------------------
--- mergesvn 2007-02-19 03:08:12-0800 1.2
+++ mergesvn 2007-02-20 04:33:14-0800 1.3
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 172 2007-02-14 20:20:52Z sunny $
+# $Id: mergesvn 174 2007-02-17 23:08:03Z sunny $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -26,7 +26,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 172 2007-02-14 20:20:52Z sunny $';
+my $rcs_id = '$Id: mergesvn 174 2007-02-17 23:08:03Z sunny $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -72,7 +72,7 @@
         if ($Curr =~ /^(\d+) (.+)$/) {
             my ($last_merge, $master_file) =
                ( $1, $2);
- $master_file =~ s/[\r\n]$//;
+ $master_file =~ s/[\r\n]+$//;
             my $safe_master_file = escape_filename($master_file);
             mysyst($CMD_SVN, "update", $File);
             my $curr_rev = `$CMD_SVN log -r$Opt{'to'}:1 --limit 1 --xml $safe_master_file`; # FIXME
@@ -186,7 +186,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 172 2007-02-14 20:20:52Z sunny $
+$Id: mergesvn 174 2007-02-17 23:08:03Z sunny $
 
 =head1 SYNOPSIS
 
@@ -266,4 +266,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 172 2007-02-14 20:20:52Z sunny $
+# End of file $Id: mergesvn 174 2007-02-17 23:08:03Z sunny $

« 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-02-20 04:33:16 PST
Messages per page: