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-02-25 14:35:34 PST
Message User: sunny256
Date: 2007-02-25 14:35:34-0800
Log:
 r176 | sunny256 | 2007-02-24 11:17:02 +0000 (Sat, 24 Feb 2007) | 3 lines
 
 * /trunk/src/mergesvn
   POD and help screen updates.

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.4&​r2=1.5
Delta lines: +17 -15
---------------------
--- mergesvn 2007-02-25 14:34:43-0800 1.4
+++ mergesvn 2007-02-25 14:35:31-0800 1.5
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 175 2007-02-24 10:31:12Z sunny256 $
+# $Id: mergesvn 176 2007-02-24 11:17:02Z sunny256 $
 # Merges new changes into a file version controlled by Subversion.
 #
 # Character set: UTF-8
@@ -27,7 +27,7 @@
 our $progname = $0;
 $progname =~ s#^.*/(.*?)$#$1#;
 
-my $rcs_id = '$Id: mergesvn 175 2007-02-24 10:31:12Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 176 2007-02-24 11:17:02Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -147,9 +147,10 @@
 
 $rcs_id
 
-Merge changes between Subversion controlled files. Files without the
-"mergesvn" property will be ignored. If no filenames are specified on
-the command line, it reads filenames from stdin.
+Merge changes between Subversion controlled files or directories.
+Elements without the "mergesvn" property will be ignored. If no
+filenames are specified on the command line, it reads filenames from
+stdin.
 
 Usage: $progname [options] [file [files [...]]]
 
@@ -197,7 +198,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 175 2007-02-24 10:31:12Z sunny256 $
+$Id: mergesvn 176 2007-02-24 11:17:02Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -205,12 +206,13 @@
 
 =head1 DESCRIPTION
 
-Merge changes between Subversion controlled files.
-Files without the "mergesvn" property will be ignored.
+Merge changes between Subversion controlled files or directories.
+Elements without the "mergesvn" property will be ignored.
 If no filenames are specified on the command line, it reads filenames
 from stdin.
 
-Needs to have the following property set to work:
+Files or directories to be controlled by mergesvn must have the
+following property set:
 
 =over 4
 
@@ -218,7 +220,7 @@
 
 =back
 
-Which contains one line for every place to merge from.
+Contains one line for every place to merge from.
 The line consists of two elements, the revision in the master file the
 last merge was done, and path or URL to the master file.
 These two fields are separated by exactly one space (U+0020).
@@ -236,6 +238,10 @@
 
 Print a brief help summary.
 
+=item B<-t>, B<--to> I<x>
+
+Merge to revision I<x> instead of HEAD.
+
 =item B<--version>
 
 Print version information.
@@ -246,10 +252,6 @@
 
 =back
 
-=head1 BUGS
-
-
-
 =head1 AUTHOR
 
 Made by Øyvind A. Holm S<E<lt>sunn​y@sunbase.orgE<gt​>>.
@@ -282,4 +284,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 175 2007-02-24 10:31:12Z sunny256 $
+# End of file $Id: mergesvn 176 2007-02-24 11:17:02Z 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-02-25 14:35:34 PST
Messages per page: