Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /svnutils/trunk/src/doc/

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/doc/

Author sunny256
Full name Øyvind A. Holm
Date 2005-05-11 21:04:30 PDT
Message User: sunny256
Date: 2005/05/11 21:04:30

Modified:
   svnutils/trunk/src/d​oc/svndiff.1

Log:
 r143 | sunny256 | 2005-05-12 04:01:02 +0000 (Thu, 12 May 2005) | 5 lines
 
 Manpage update for svndiff.
 
 * /trunk/src/doc/svndiff.1
   Generated from svndiff r142.

File Changes:

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

File [changed]: svndiff.1
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​doc/svndiff.1?r1=1.8​&r2=1.9
Delta lines: +41 -9
--------------------
--- svndiff.1 11 May 2005 07:34:19 -0000 1.8
+++ svndiff.1 12 May 2005 04:04:28 -0000 1.9
@@ -129,20 +129,24 @@
 .\" ====================​====================​====================​============
 .\"
 .IX Title "SVNDIFF 1"
-.TH SVNDIFF 1 "2005-05-11" "perl v5.8.4" "User Contributed Perl Documentation"
+.TH SVNDIFF 1 "2005-05-12" "perl v5.8.4" "User Contributed Perl Documentation"
 .SH "NAME"
 svndiff
 .SH "REVISION"
 .IX Header "REVISION"
-$Id: svndiff 137 2005\-05\-11 07:25:44Z sunny256 $
+$Id: svndiff 142 2005\-05\-12 03:53:51Z sunny256 $
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 svndiff [options] [file [...]]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-Run the diff program on every modified file in current directory and all
-subdirectories or on the files specified on the command line.
-Needs the svn command-line client unless files are specified.
+Run the specified diff program on every modified file in current
+directory and all subdirectories or on the files specified on the
+command line.
+An \s-1URL\s0 to a file can also be specified, but then the \-\-revision option
+has to be specified.
+.PP
+The program needs the \fIsvn\fR\|(1) commandline client to run.
 .IP "\fB\-C\fR, \fB\-\-conflict\fR" 4
 .IX Item "-C, --conflict"
 Only run diff on conflicted files.
@@ -156,7 +160,7 @@
 Example:
 .Sp
 .Vb 1
-\& svndiff -e /usr/local/bin/svn-1.0
+\& svndiff \-e /usr/local/bin/svn\-1.0
 .Ve
 .IP "\fB\-p\fR, \fB\-\-diffargs\fR x" 4
 .IX Item "-p, --diffargs x"
@@ -168,11 +172,12 @@
 .IX Item "-r, --revision x"
 Run the external diff command against previous revisions:
 .Sp
-.Vb 4
+.Vb 5
 \& 111:222
 \& Compare r111 and r222.
 \& 123
-\& Compare your working file against r123.
+\& Compare your working file against r123. If the file is an URL, the
+\& second revision is set to HEAD.
 .Ve
 .SH "FILES"
 .IX Header "FILES"
@@ -190,7 +195,7 @@
 \& <name>vimdiff​</name>
 \& <reverse>1<​/reverse>
 \& </program>
-\& <!-- Several "program" element groups can be specified -->
+\& <!\-\- Several "program" element groups can be specified \-\->
 \& </reversediffs>
 \& </svndiffrc>
 .Ve
@@ -227,6 +232,33 @@
 .IP "\fI\s-1SVNDIFFRC\s0\fR" 4
 .IX Item "SVNDIFFRC"
 Path to a configuration file in another location than \fI~/.svndiffrc\fR .
+.SH "USAGE TIPS"
+.IX Header "USAGE TIPS"
+.Sh "vimdiff mappings"
+.IX Subsection "vimdiff mappings"
+The standard diff program used in this script is \fIvimdiff\fR\|(1) which in
+fact is the Vim editor called with another name.
+The main reasons for this are because Vim is Free and widely available,
+portable, console based and an effective diff tool.
+The following macros makes moving differences between windows easier
+(can also be put into \fI~/.vimrc\fR):
+.PP
+.Vb 2
+\& " F1: Move differences from the other window to the current window.
+\& map <f1> :diffget<cr>]cz.
+.Ve
+.PP
+.Vb 2
+\& " F2: Move differences from the current window to the other window.
+\& map <f2> :diffput<cr>]c
+.Ve
+.PP
+.Vb 4
+\& " F12: Update the syntax highlighting and the diffs. Use this if your
+\& " diff isn’t properly updated.
+\& noremap <f12> :syntax sync fromstart<cr>:​diffu<cr>
+\& inoremap <f12> <esc>:syntax sync fromstart<cr>:​diffu<cr>a
+.Ve
 .SH "AUTHOR"
 .IX Header "AUTHOR"
 Made by Øyvind A. Holm <sunny\ _AT_\ sunbase.org>.

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

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/doc/ sunny256 Øyvind A. Holm 2005-05-11 21:04:30 PDT
Messages per page: