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-03-05 08:44:36 PST
Message User: sunny256
Date: 2007-03-05 08:44:36-0800
Log:
 r184 | sunny256 | 2007-03-04 15:40:09 +0000 (Sun, 04 Mar 2007) | 3 lines
 
 * /trunk/src/doc/mergesvn.1
   Generated from mergesvn r183.

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.​3&r2=1.4
Delta lines: +12 -3
--------------------
--- mergesvn.1 2007-03-05 08:42:57-0800 1.3
+++ mergesvn.1 2007-03-05 08:44:33-0800 1.4
@@ -134,7 +134,7 @@
 mergesvn
 .SH "REVISION"
 .IX Header "REVISION"
-$Id: mergesvn 180 2007\-03\-04 12:07:26Z sunny $
+$Id: mergesvn 183 2007\-03\-04 15:38:04Z sunny $
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 mergesvn [options] [file [files [...]]]
@@ -158,8 +158,12 @@
 .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.
+Use \fIx\fR as alias for the master \s-1URL\s0. The old value will still be
+written to the mergesvn property.
+.IP "\fB\-d\fR, \fB\-\-diff\fR" 4
+.IX Item "-d, --diff"
+Instead of merging, show a repository diff between the master \s-1URL\s0 and
+the versioned element.
 .IP "\fB\-\-dry\-run\fR" 4
 .IX Item "--dry-run"
 Try operation without making any changes.
@@ -176,6 +180,10 @@
 .IP "\fB\-\-debug\fR" 4
 .IX Item "--debug"
 Print debugging messages.
+.SH "BUGS"
+.IX Header "BUGS"
+.IP "The \fIsvn\fR\|(1) client does not support diffs between different repositories (yet), so the \fB\-\-diff\fR option will only work with elements that has the master in the same repository." 4
+.IX Item "The svn client does not support diffs between different repositories (yet), so the --diff option will only work with elements that has the master in the same repository."
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Made by Øyvind A. Holm <sunny at sunbase dot org>.
@@ -200,3 +208,4 @@
 59 Temple Place, Suite 330, Boston, \s-1MA\s0 02111\-1307 \s-1USA\s0
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
+\&\fIsvn\fR\|(1)

« 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-03-05 08:44:36 PST
Messages per page: