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-04-07 06:09:21 PDT
Message User: sunny256
Date: 2007-04-07 06:09:21-0700
Log:
 r195 | sunny256 | 2007-04-02 22:50:49 +0000 (Mon, 02 Apr 2007) | 4 lines
 
 * /trunk/src/mergesvn
   Replaced some "svn" and "mergesvn" strings with $CMD_SVN and
   $PROP_NAME, respectively.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.16​&r2=1.17
Delta lines: +9 -9
-------------------
--- mergesvn 2007-04-07 06:08:48-0700 1.16
+++ mergesvn 2007-04-07 06:09:18-0700 1.17
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 194 2007-04-02 22:42:41Z sunny256 $
+# $Id: mergesvn 195 2007-04-02 22:50:49Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -32,7 +32,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 194 2007-04-02 22:42:41Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 195 2007-04-02 22:50:49Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -69,9 +69,9 @@
 for (@Files) {
     # {{{
     my $File = $_;
- my $prop_val = `svn propget $PROP_NAME $File`;
+ my $prop_val = `$CMD_SVN propget $PROP_NAME $File`;
     if (!length($prop_val)) {
- warn("$progname: $File: \"mergesvn\" property not found, " .
+ warn("$progname: $File: \"$PROP_NAME\" property not found, " .
              "skipping file\n");
         next LOOP;
     }
@@ -234,7 +234,7 @@
     my $Data = "";
     my @Revs = ();
 
- if (open(PipeFP, "svn log --xml -r$Start:$End $safe_file |")) {
+ if (open(PipeFP, "$CMD_SVN log --xml -r$Start:$End $safe_file |")) {
         $Data = join("", <PipeFP>);
         close(PipeFP);
         $Data =~ s/<logentry\b.*?​\brevision="(\d+)"​.*?>/push(@Revs, "$1")/egs;
@@ -317,7 +317,7 @@
 $rcs_id
 
 Merge changes between Subversion controlled files or directories.
-Elements without the "mergesvn" property will be ignored. If no
+Elements without the "$PROP_NAME" property will be ignored. If no
 filenames are specified on the command line, it reads filenames from
 stdin.
 
@@ -327,7 +327,7 @@
 
   -a x, --alias x
     Use x as alias for the master URL. The old value will still be
- written to the mergesvn property.
+ written to the $PROP_NAME property.
   -C, --conflict
     Do not merge, but search for the first revision a conflict will
     occur when a merge is done. After the search is finished, the first
@@ -379,7 +379,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 194 2007-04-02 22:42:41Z sunny256 $
+$Id: mergesvn 195 2007-04-02 22:50:49Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -495,4 +495,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 194 2007-04-02 22:42:41Z sunny256 $
+# End of file $Id: mergesvn 195 2007-04-02 22:50:49Z 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-04-07 06:09:21 PDT
Messages per page: