Login | Register
My pages Projects Community openCollabNet

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

svnutils
Discussion topic

Hide all messages in topic

All messages in topic

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

Author sunny256
Full name Øyvind A. Holm
Date 2007-02-19 03:09:27 PST
Message User: sunny256
Date: 2007-02-19 03:09:27-0800
Log:
 r173 | sunny | 2007-02-14 21:46:47 +0100 (Wed, 14 Feb 2007) | 3 lines
 
 * /trunk/src/doc/mergesvn.1
   Added manpage for mergesvn.

File Changes:

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

File [added]: mergesvn.1
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​doc/mergesvn.1?rev=1​.1&content-type=​text/vnd.viewcvs-mar​kup
Added lines: 192
----------------
.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
.\"
.\" Standard preamble:
.\" ====================​====================​====================​============
.de Sh \" Subsection heading
.br
.if t .Sp
.ne 5
.PP
\fB\\$1\fR
.PP
..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.de Vb \" Begin verbatim text
.ft CW
.nf
.ne \\$1
..
.de Ve \" End verbatim text
.ft R
.fi
..
.\" Set up some character translations and predefined strings. \*(-- will
.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
.\" double quote, and \*(R" will give a right double quote. | will give a
.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to
.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C'
.\" expand to `' in nroff, nothing in troff, for use with C<>.
.tr \(*W-|\(bv\*(Tr
.ds C+ C\v'-.1v'\h'-1p'\​s-2+\h'-1p'+\s0\v​'.1v'\h'-1p'
.ie n \{\
. ds -- \(*W-
. ds PI pi
. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
. ds L" ""
. ds R" ""
. ds C` ""
. ds C' ""
'br\}
.el\{\
. ds -- \|\(em\|
. ds PI \(*p
. ds L" ``
. ds R" ''
'br\}
.\"
.\" If the F register is turned on, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
.if \nF \{\
. de IX
. tm Index:\\$1\t\\n%\t"\\$2"
..
. nr % 0
. rr F
.\}
.\"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.hy 0
.if n .na
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
. \" fudge factors for nroff and troff
.if n \{\
. ds #H 0
. ds #V .8m
. ds #F .3m
. ds #[ \f1
. ds #] \fP
.\}
.if t \{\
. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
. ds #V .6m
. ds #F 0
. ds #[ \&
. ds #] \&
.\}
. \" simple accents for nroff and troff
.if n \{\
. ds ' \&
. ds ` \&
. ds ^ \&
. ds , \&
. ds ~ ~
. ds /
.\}
.if t \{\
. ds ' \\k:\h'-(\\n(.w​u*8/10-\*(#H)'\'\​h"|\\n:u"
. ds ` \\k:\h'-(\\n(.w​u*8/10-\*(#H)'\`\​h'|\\n:u'
. ds ^ \\k:\h'-(\\n(.w​u*10/11-\*(#H)'^\h​'|\\n:u'
. ds , \\k:\h'-(\\n(.w​u*8/10)',\h'|\\n:​u'
. ds ~ \\k:\h'-(\\n(.w​u-\*(#H-.1m)'~\h'|​\\n:u'
. ds / \\k:\h'-(\\n(.w​u*8/10-\*(#H)'\z\​(sl\h'|\\n:u'
.\}
. \" troff and (daisy-wheel) nroff accents
.ds : \\k:\h'-(\\n(.w​u*8/10-\*(#H+.1m+\​*(#F)'\v'-\*(#V'\​z.\h'.2m+\*(#F'.\​h'|\\n:u'\v'\*(#​V'
.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
.ds o \\k:\h'-(\\n(.w​u+\w'\(de'u-\*(#H​)/2u'\v'-.3n'\*(#[​\z\(de\v'.3n'\h'​|\\n:u'\*(#]
.ds d- \h'\*(#H'\(pd\h'​-\w'~'u'\v'-.25m'​f2\(hy\fP\v'.25m​'\h'-\*(#H'
.ds D- D\\k:\h'-\w'D'u'​\v'-.11m'\z\(hy\​v'.11m'\h'|\\n:u'​
.ds th \*(#[\v'.3m'\s+1I​\s-1\v'-.3m'\h'-(​\w'I'u*2/3)'\s-1o​s+1\*(#]
.ds Th \*(#[\s+2I\s-2\h​'-\w'I'u*3/5'\v'-.​3m'o\v'.3m'\*(#]
.ds ae a\h'-(\w'a'u*4/10)'e
.ds Ae A\h'-(\w'A'u*4/10)'E
. \" corrections for vroff
.if v .ds ~ \\k:\h'-(\\n(.w​u*9/10-\*(#H)'\s-2​\u~\d\s+2\h'|\​n:u'
.if v .ds ^ \\k:\h'-(\\n(.w​u*10/11-\*(#H)'\v'​-.4m'^\v'.4m'\h'|​\n:u'
. \" for low resolution devices (crt and lpr)
.if \n(.H>23 .if \n(.V>19 \
\{\
. ds : e
. ds 8 ss
. ds o a
. ds d- d\h'-1'\(ga
. ds D- D\h'-1'\(hy
. ds th \o'bp'
. ds Th \o'LP'
. ds ae ae
. ds Ae AE
.\}
.rm #[ #] #H #V #F C
.\" ====================​====================​====================​============
.\"
.IX Title "MERGESVN 1"
.TH MERGESVN 1 "2007-02-14" "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 $
.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.
If no filenames are specified on the command line, it reads filenames
from stdin.
.PP
Needs to have the following property set to work:
.IP "\fBmergesvn\fR" 4
.IX Item "mergesvn"
.PP
Which 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\-h\fR, \fB\-\-help\fR" 4
.IX Item "-h, --help"
Print a brief help summary.
.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>.
.SH "COPYRIGHT"
.IX Header "COPYRIGHT"
Copyleft © Øyvind A. Holm &lt;sunny@sunbas​e.org&gt;
This is free software; see the file \fI\s-1COPYING\s0\fR for legalese stuff.
.SH "LICENCE"
.IX Header "LICENCE"
This program is free software; you can redistribute it and/or modify it
under the terms of the \s-1GNU\s0 General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
.PP
This program is distributed in the hope that it will be useful, but
\&\s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0.
See the \s-1GNU\s0 General Public License for more details.
.PP
You should have received a copy of the \s-1GNU\s0 General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
59 Temple Place, Suite 330, Boston, \s-1MA\s0 02111\-1307 \s-1USA\s0
.SH "SEE ALSO"
.IX Header "SEE ALSO"
Messages per page: