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-03 20:00:16 PDT
Message User: sunny256
Date: 2008-10-03 20:00:16-0700
Log:
 r223 | sunny256 | 2008-10-02 21:08:10 +0000 (Thu, 02 Oct 2008) | 9 lines
 
 * /trunk/src/tests/findrev.t
 * /trunk/src/tests/mergesvn.t
 * /trunk/src/tests/sident.t
 * /trunk/src/tests/svndiff.t
   (No Id with only -h): Use ok() instead of unlike(), some weird error
     on at least Debian 3.1 (sarge) and older.
 
 1fe1a5aa-90c6-11dd-b​30b-000475e441b9 (svn)
 820f5358-91c0-11dd-b​8d5-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.30​&r2=1.31
Delta lines: +6 -5
-------------------
--- mergesvn 2008-10-02 14:21:37-0700 1.30
+++ mergesvn 2008-10-03 20:00:13-0700 1.31
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 224 2008-10-02 21:16:16Z sunny256 $
+# $Id: mergesvn 222 2008-10-02 15:46:29Z 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 224 2008-10-02 21:16:16Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -123,7 +123,8 @@
                 my $Repos = repos_url($File);
                 mysyst(
                     $CMD_SVN, "diff",
- repos_url($master_file) . "\@$last_merge",
+ repos_url($master_file),
+ "-r", $last_merge,
                     $Repos
                 );
                 next LOOP;
@@ -485,7 +486,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 224 2008-10-02 21:16:16Z sunny256 $
+$Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -621,4 +622,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 224 2008-10-02 21:16:16Z sunny256 $
+# End of file $Id: mergesvn 222 2008-10-02 15:46:29Z sunny256 $

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/mergesvn sunny256 Øyvind A. Holm 2008-10-03 20:00:16 PDT
     Re: CVS update: /svnutils/trunk/src/mergesvn =?utf-8?Q?=C3=98yvind_A=2E?= Holm <sunny at sunbase dot org> =?utf-8?Q?=C3=98yvind_A=2E?= Holm <sunny at sunbase dot org> 2008-10-03 20:58:13 PDT
Messages per page: