1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231
|
.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.32
.\"
.\" 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. \*(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-
.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(.wu*8/10-\*(#H)'\'\h"|\\n:u"
. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
.\}
. \" troff and (daisy-wheel) nroff accents
.ds : \\k:\h'-(\\n(.wu*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(.wu+\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(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
.if v .ds ^ \\k:\h'-(\\n(.wu*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 "COMMIT-PATCH 1"
.TH COMMIT-PATCH 1 "2006-08-23" "perl v5.8.8" "User Commands"
.SH "NAME"
commit\-patch \- commit patches to \fICVS\fR, \fIDarcs\fR or \fIMercurial\fR repositories
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
commit-patch [\fB\-m\fR \fImessage\fR] \fIpatch-file\fR
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
Normally version control systems don't allow fine grained
commits. \fBcommit-patch\fR allows the user to control \fIexactly\fR what
gets committed (or \*(L"recorded\*(R", in \fIDarcs\fR parlance) by letting the user
supply a patch to be committed rather than using the files in the
current working directory.
.PP
\&\fBcommit-patch\fR currently supports the following version control systems:
\&\fB\f(BI\s-1CVS\s0\fB\fR, \fB\f(BIDarcs\fB\fR, and \fB\f(BIMercurial\fB\fR.
.SH "OPTIONS"
.IX Header "OPTIONS"
\&\fB\-m\fR, \fB\-\-message\fR=\fImessage\fR \- An optional \fImessage\fR to use as the commit
text. If the message is multiple lines then \fIMercurial\fR and \fIDarcs\fR
will use the first line as the patch name and the rest as commit
details. If the \f(CW\*(C`\-m\*(C'\fR option is not specified then the result will be
the same as whatever the underlying version control system would do if
you didn't specify a message name on the command line. That is,
\&\fBcommit-patch\fR does not interfere with the patch naming process of
the underlying version control system; \fIDarcs\fR will still ask you
interactively and \fI\s-1CVS\s0\fR will still launch your editor.
.SH "DIAGNOSTICS"
.IX Header "DIAGNOSTICS"
\&\fBcommit-patch\fR works by manipulating the working directory using
\&\f(CW\*(C`patch\*(C'\fR, \f(CW\*(C`interdiff\*(C'\fR, and the underlying version control system's
\&\f(CW\*(C`diff\*(C'\fR. If any part of the process fails, \fBcommit-patch\fR will
attempt to restore the working directory to the state it was before
the command was run. Any errors from the underlying version control
system or from patch will be printed.
.SH "CAVEATS"
.IX Header "CAVEATS"
The patch specified on the command line must originate from the same
place as the current directory. That is, the following will not work:
.PP
.Vb 3
\& cvs diff \-u > ../a.patch
\& cd ..
\& commit\-patch a.patch
.Ve
.PP
You \fBmust\fR run \fBcommit-patch\fR from the same directory that the
original patch was based from.
.PP
\&\fIDarcs\fR and \fIMercurial\fR put \f(CW\*(C`a/\*(C'\fR and \f(CW\*(C`b/\*(C'\fR in front of all the paths
in the diff output. Don't worry about this; \fBcommit-patch\fR takes it into
account.
.SH "EXAMPLES"
.IX Header "EXAMPLES"
Typical \fI\s-1CVS\s0\fR usage:
.PP
.Vb 3
\& cvs diff \-u > a.patch
\& emacs a.patch
\& commit\-patch a.patch
.Ve
.PP
\&\fIMercurial\fR usage with a message specified:
.PP
.Vb 3
\& hg diff > a.patch
\& emacs a.patch
\& commit\-patch \-m "This is a commit message" a.patch
.Ve
.PP
\&\fIDarcs\fR usage with a multi-line message specified:
.PP
.Vb 4
\& darcs diff \-u > a.patch
\& emacs a.patch
\& commit\-patch \-m 'This is the patch name
\& Here are the patch details' a.patch
.Ve
.SH "AUTHORS"
.IX Header "AUTHORS"
.IP "\(bu" 4
David Caldwell <david@porkrind.org>
.IP "\(bu" 4
Jim Radford <radford@blackbean.org>
.SH "COPYRIGHT AND LICENSE"
.IX Header "COPYRIGHT AND LICENSE"
Copyright 2003\-2006 by David Caldwell and Jim Radford.
.PP
\&\fBcommit-patch\fR is distributed under the \s-1GNU\s0 General Public
License. See the \s-1COPYING\s0 file in the distribution for more details.
.SH "HISTORY"
.IX Header "HISTORY"
\&\fBcommit-patch\fR was originally called \f(CW\*(C`cvs\-commit\-patch\*(C'\fR and was a
bash script written in 2003 by Jim Radford (with David Caldwell in the
room drawing the procedure on a white board). David later converted it
do \f(CW\*(C`darcs\-commit\-patch\*(C'\fR, then integrated them back together into
\&\fBcommit-patch\fR. \fIMercurial\fR support was then added. At some point
David translated from bash into perl because funky bash quoting issues
were causing problems with a repository that had a space in one of the
directory names.
|