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-03-08 03:09:10 PST
Message User: sunny256
Date: 2007-03-08 03:09:10-0800
Log:
 r189 | sunny256 | 2007-03-08 11:06:16 +0000 (Thu, 08 Mar 2007) | 4 lines
 
 * /trunk/src/mergesvn
   (usage, POD): Typo fix. The short version of the --conflict option is
     "-C", not "-c".

File Changes:

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

File [changed]: mergesvn
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​mergesvn?r1=1.13​&r2=1.14
Delta lines: +6 -6
-------------------
--- mergesvn 2007-03-05 08:46:11-0800 1.13
+++ mergesvn 2007-03-08 03:09:07-0800 1.14
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #===================​====================​====================​============
-# $Id: mergesvn 187 2007-03-05 16:38:47Z sunny256 $
+# $Id: mergesvn 189 2007-03-08 11:06:16Z 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 187 2007-03-05 16:38:47Z sunny256 $';
+my $rcs_id = '$Id: mergesvn 189 2007-03-08 11:06:16Z sunny256 $';
 my $id_date = $rcs_id;
 $id_date =~ s/^.*?\d+ (\d\d\d\d-.*?\d​\d:\d\d:\d\d\S​+).*/$1/;
 
@@ -315,7 +315,7 @@
   -a x, --alias x
     Use x as alias for the master URL. The old value will still be
     written to the mergesvn property.
- -c, --conflict
+ -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
     revision number of a troublesome patch is printed, and you can
@@ -366,7 +366,7 @@
 
 =head1 REVISION
 
-$Id: mergesvn 187 2007-03-05 16:38:47Z sunny256 $
+$Id: mergesvn 189 2007-03-08 11:06:16Z sunny256 $
 
 =head1 SYNOPSIS
 
@@ -402,7 +402,7 @@
 Use I<x> as alias for the master URL. The old value will still be
 written to the mergesvn property.
 
-=item B<-c>, B<--conflict>
+=item B<-C>, B<--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 revision
@@ -482,4 +482,4 @@
 # }}}
 
 # vim: set fenc=UTF-8 ft=perl fdm=marker ts=4 sw=4 sts=4 et fo+=w :
-# End of file $Id: mergesvn 187 2007-03-05 16:38:47Z sunny256 $
+# End of file $Id: mergesvn 189 2007-03-08 11:06: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 2007-03-08 03:09:10 PST
Messages per page: