Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /svnutils/trunk/src/doc/mergesvn.1

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/doc/mergesvn.1

Author sunny256
Full name Øyvind A. Holm
Date 2007-02-25 14:35:57 PST
Message User: sunny256
Date: 2007-02-25 14:35:57-0800
Log:
 r177 | sunny256 | 2007-02-24 11:19:45 +0000 (Sat, 24 Feb 2007) | 3 lines
 
 * /trunk/src/doc/mergesvn.1
   Generated from mergesvn r176.

File Changes:

Directory: /svnutils/trunk/src/doc/
====================​===============

File [changed]: mergesvn.1
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​doc/mergesvn.1?r1=1.​1&r2=1.2
Delta lines: +14 -8
--------------------
--- mergesvn.1 2007-02-19 03:09:24-0800 1.1
+++ mergesvn.1 2007-02-25 14:35:55-0800 1.2
@@ -129,43 +129,49 @@
 .\" ====================​====================​====================​============
 .\"
 .IX Title "MERGESVN 1"
-.TH MERGESVN 1 "2007-02-14" "perl v5.8.4" "User Contributed Perl Documentation"
+.TH MERGESVN 1 "2007-02-24" "perl v5.8.4" "User Contributed Perl Documentation"
 .SH "NAME"
 mergesvn
 .SH "REVISION"
 .IX Header "REVISION"
-$Id: mergesvn 172 2007\-02\-14 20:20:52Z sunny $
+$Id: mergesvn 176 2007\-02\-24 11:17:02Z sunny $
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 mergesvn [options] [file [files [...]]]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-Merge changes between Subversion controlled files.
-Files without the \*(L"mergesvn\*(R" property will be ignored.
+Merge changes between Subversion controlled files or directories.
+Elements without the \*(L"mergesvn\*(R" property will be ignored.
 If no filenames are specified on the command line, it reads filenames
 from stdin.
 .PP
-Needs to have the following property set to work:
+Files or directories to be controlled by mergesvn must have the
+following property set:
 .IP "\fBmergesvn\fR" 4
 .IX Item "mergesvn"
 .PP
-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 \s-1URL\s0 to the master file.
 These two fields are separated by exactly one space (U+0020).
 .SH "OPTIONS"
 .IX Header "OPTIONS"
+.IP "\fB\-a\fR, \fB\-\-alias\fR \fIx\fR" 4
+.IX Item "-a, --alias x"
+Use \fIx\fR as alias for the \s-1URL\s0. The old value will still be written to
+the mergesvn property.
 .IP "\fB\-h\fR, \fB\-\-help\fR" 4
 .IX Item "-h, --help"
 Print a brief help summary.
+.IP "\fB\-t\fR, \fB\-\-to\fR \fIx\fR" 4
+.IX Item "-t, --to x"
+Merge to revision \fIx\fR instead of \s-1HEAD\s0.
 .IP "\fB\-\-version\fR" 4
 .IX Item "--version"
 Print version information.
 .IP "\fB\-\-debug\fR" 4
 .IX Item "--debug"
 Print debugging messages.
-.SH "BUGS"
-.IX Header "BUGS"
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Made by Øyvind A. Holm <sunny at sunbase dot org>.

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

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/doc/mergesvn.1 sunny256 Øyvind A. Holm 2007-02-25 14:35:57 PST
Messages per page: