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 2008-10-02 14:21:39 PDT
Message User: sunny256
Date: 2008-10-02 14:21:39-0700
Log:
 r224 | sunny256 | 2008-10-02 21:16:16 +0000 (Thu, 02 Oct 2008) | 5 lines
 
 * /trunk/src/mergesvn
   Revert part of r220; go back to using @ instead of -r when diffing.
 
 3a9a3820-90c7-11dd-a​d8d-000475e441b9 (svn)
 13f47ea0-90c8-11dd-a​96a-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.29​&r2=1.30
Delta lines: +5 -6
-------------------
--- mergesvn 2008-10-02 08:49:27-0700 1.29
+++ mergesvn 2008-10-02 14:21:37-0700 1.30
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $
+# $Id: mergesvn 224 2008-10-02 21:16:16Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -41,7 +41,7 @@
 our $progname = $0;
 $progname =~ s/^.*\/(.*?)$/$1/;
 
-my $rcs_id = '$Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 224 2008-10-02 21:16:16Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -123,8 +123,7 @@
                 my $Repos = repos_url($File);
                 mysyst(
                     $CMD_SVN, "diff",
- repos_url($master_file),
- "-r", $last_merge,
+ repos_url($master_file) . "\@$last_merge",
                     $Repos
                 );
                 next LOOP;
@@ -486,7 +485,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $
+$Id: mergesvn 224 2008-10-02 21:16:16Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -622,4 +621,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $
+# End of file $Id: mergesvn 224 2008-10-02 21:16:16Z 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-10-02 14:21:39 PDT
Messages per page: