1*60addc80Sjmc.\" $OpenBSD: cvs.5,v 1.9 2013/06/29 09:08:41 jmc Exp $ 2a7bff744Sjmc.\" 3a7bff744Sjmc.\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> 4d457b005Sxsa.\" Copyright (c) 2004-2008 Xavier Santolaria <xsa@openbsd.org> 5a7bff744Sjmc.\" All rights reserved. 6a7bff744Sjmc.\" 7a7bff744Sjmc.\" Redistribution and use in source and binary forms, with or without 8a7bff744Sjmc.\" modification, are permitted provided that the following conditions 9a7bff744Sjmc.\" are met: 10a7bff744Sjmc.\" 11a7bff744Sjmc.\" 1. Redistributions of source code must retain the above copyright 12a7bff744Sjmc.\" notice, this list of conditions and the following disclaimer. 13a7bff744Sjmc.\" 2. The name of the author may not be used to endorse or promote products 14a7bff744Sjmc.\" derived from this software without specific prior written permission. 15a7bff744Sjmc.\" 16a7bff744Sjmc.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, 17a7bff744Sjmc.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY 18a7bff744Sjmc.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 19a7bff744Sjmc.\" THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 20a7bff744Sjmc.\" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21a7bff744Sjmc.\" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 22a7bff744Sjmc.\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 23a7bff744Sjmc.\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 24a7bff744Sjmc.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 25a7bff744Sjmc.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26a7bff744Sjmc.\" 27*60addc80Sjmc.Dd $Mdocdate: June 29 2013 $ 28a7bff744Sjmc.Dt CVS 5 29a7bff744Sjmc.Os 30a7bff744Sjmc.Sh NAME 31a7bff744Sjmc.Nm cvs 32a7bff744Sjmc.Nd OpenCVS files format 33a7bff744Sjmc.Sh DESCRIPTION 34a7bff744SjmcThis manual page documents the various support files for 35a7bff744Sjmc.Xr cvs 1 36a7bff744Sjmcand the format of those files. 37a7bff744Sjmc.Pp 38a7bff744SjmcThe location of a module's files are known as its 39a7bff744Sjmc.Dv CVSROOT . 40a7bff744SjmcThe files within CVSROOT are as follows: 41a7bff744Sjmc.Bl -tag -width Ds 42a7bff744Sjmc.It Pa $CVSROOT/CVSROOT 43a7bff744SjmcDirectory containing repository administrative files. 44a7bff744Sjmc.It Pa $CVSROOT/CVSROOT/config 45a7bff744SjmcFile containing various configuration options. 46a7bff744SjmcThe format of each line is as follows: 47a7bff744Sjmc.Pp 48a7bff744Sjmc.Dl keyword=value 49a7bff744Sjmc.Pp 50a7bff744SjmcExtraneous spaces or tabs are not permitted. 51a7bff744SjmcA line beginning with a hash character 52a7bff744Sjmc.Pq Sq # 53a7bff744Sjmcis considered a comment and ignored. 54a7bff744Sjmc.Pp 55a7bff744SjmcThe following options are available: 56a7bff744Sjmc.Pp 57a7bff744Sjmc.Bl -tag -width "dlimit=XvalueXXX" -offset indent -compact 58a7bff744Sjmc.It dlimit='value' 59a7bff744SjmcSet the process data size limit. 60a7bff744Sjmc.It tag='value' 61a7bff744SjmcSet the name of a local tag to use in addition to Id. 62a7bff744Sjmc.It umask='value' 63a7bff744SjmcSet the default umask to use when creating files and directories. 64a7bff744Sjmc.El 65a7bff744Sjmc.It Pa $CVSROOT/CVSROOT/history 66a7bff744SjmcFile containing reports of 67a7bff744Sjmc.Ic checkout , 68a7bff744Sjmc.Ic commit , 69a7bff744Sjmc.Ic export , 70a7bff744Sjmc.Ic release , 71a7bff744Sjmc.Ic rtag , 72a7bff744Sjmcand 73a7bff744Sjmc.Ic update 74a7bff744Sjmccommands that have been issued. 75a7bff744SjmcBy default, the 76a7bff744Sjmc.Ic init 77a7bff744Sjmccommand creates the 78a7bff744Sjmc.Pa history 79a7bff744Sjmcfile. 80a7bff744SjmcTo disable history logging, the 81a7bff744Sjmc.Pa history 82a7bff744Sjmcfile should be removed manually. 83a7bff744SjmcThe 84a7bff744Sjmc.Ic history 85a7bff744Sjmccommand shows these reports according to several criteria. 86a7bff744Sjmc.It Pa $CVSROOT/CVSROOT/loginfo 87a7bff744SjmcFile containing associations between modules and handlers for 88a7bff744Sjmcpost-commit logging. 89d457b005Sxsa.It Pa $CVSROOT/CVSROOT/modules 90d457b005SxsaThe format of each line is as follows: 91d457b005Sxsa.Pp 92b05499a8Sxsa.Dl module [option] directory [file ...] [&module ...] 93d457b005Sxsa.Pp 94d457b005SxsaEmpty lines are ignored. 95d457b005SxsaA line beginning with a hash character 96d457b005Sxsa.Pq Sq # 97d457b005Sxsais considered a comment and ignored. 98d457b005SxsaA long line can be continued on the next line by specifying a backslash 99d457b005Sxsa.Pq Sq \e 100d457b005Sxsacharacter as last character. 101d457b005Sxsa.Pp 102d457b005SxsaThe following options are available: 103d457b005Sxsa.Bl -tag -width Ds -offset 3n 104d457b005Sxsa.It Fl d Ar name 105d457b005SxsaAllow check out of module under different 106d457b005Sxsa.Ar name . 107d457b005Sxsa.It Fl i Ar prog 108d457b005SxsaSpecify program 109d457b005Sxsa.Ar prog 110d457b005Sxsato run whenever the 111d457b005Sxsa.Ic commit 112d457b005Sxsacommand is issued. 113d457b005Sxsa.It Fl o Ar prog 114d457b005SxsaSpecify program 115d457b005Sxsa.Ar prog 116d457b005Sxsato run whenever the 117d457b005Sxsa.Ic checkout 118d457b005Sxsacommand is issued. 119d457b005Sxsa.It Fl s Ar status 120d457b005SxsaSet 121d457b005Sxsa.Ar status 122d457b005Sxsato module. 123d457b005Sxsa.It Fl t Ar prog 124d457b005SxsaSpecify program 125d457b005Sxsa.Ar prog 126d457b005Sxsato run whenever the 127d457b005Sxsa.Ic rtag 128d457b005Sxsacommand is issued. 129d457b005Sxsa.It Fl u Ar prog 130d457b005SxsaSpecify program 131d457b005Sxsa.Ar prog 132d457b005Sxsato run whenever the 133d457b005Sxsa.Ic update 134d457b005Sxsacommand is issued. 135d457b005Sxsa.El 136a7bff744Sjmc.El 137a7bff744Sjmc.Pp 138a7bff744SjmcEach directory that is managed by 139a7bff744Sjmc.Nm 140a7bff744Sjmccontains a 141a7bff744Sjmc.Pa CVS 142a7bff744Sjmcdirectory. 143a7bff744SjmcThis directory is used by various 144a7bff744Sjmc.Nm 145a7bff744Sjmccommands to record the status of files in the current working directory. 146a7bff744SjmcThese files should not be modified manually by the user but by the 147a7bff744Sjmc.Nm 148a7bff744Sjmccommands instead. 149a7bff744SjmcFiles that are always stored in every 150a7bff744Sjmc.Pa CVS 151a7bff744Sjmcdirectory are as follows: 152a7bff744Sjmc.Bl -tag -width Ds 153a7bff744Sjmc.It Pa CVS/Entries 154a7bff744SjmcFile containing a list of files managed by 155a7bff744Sjmc.Nm . 156a7bff744Sjmc.Pa Entries 157a7bff744Sjmchas one line per file or directory describing the state of it with 158a7bff744Sjmcregard to the source repository. 159a7bff744SjmcThese lines have the following format: 160a7bff744Sjmc.Pp 161a7bff744Sjmc.Dl /name/revision/timestamp/options/tag 162a7bff744Sjmc.Bl -tag -width Ds 163a7bff744Sjmc.It name 164a7bff744SjmcName of the file in the directory. 165a7bff744Sjmc.It revision 166a7bff744SjmcRevision of the file in the working directory. 167a7bff744SjmcThe revision is equal to 168a7bff744Sjmc.Sq 0 169a7bff744Sjmcif the file has been added with the 170a7bff744Sjmc.Ic add 171a7bff744Sjmccommand or preceded by the 172a7bff744Sjmc.Sq - 173a7bff744Sjmccharacter if the file has been removed with the 174a7bff744Sjmc.Ic remove 175a7bff744Sjmccommand. 176a7bff744Sjmc.It timestamp 177a7bff744SjmcContains the timestamp of the file at the time 178a7bff744Sjmc.Nm 179a7bff744Sjmccreated it. 180a7bff744SjmcIf the timestamp is different from the actual modification time of the file, 181a7bff744Sjmcit means that the file has been modified. 182a7bff744Sjmc.It options 183a7bff744SjmcContains the keyword substitution mode used for this file. 184a7bff744Sjmc.It tag 185a7bff744SjmcContains 186a7bff744Sjmc.Sq T 187a7bff744Sjmcfollowed by a tagname or 188a7bff744Sjmc.Sq D 189a7bff744Sjmcfollowed by a date. 190a7bff744Sjmc.El 191a7bff744Sjmc.Pp 192a7bff744SjmcEntries corresponding to directories have the following format: 193a7bff744Sjmc.Pp 194a7bff744Sjmc.Dl D/name//// 195a7bff744Sjmc.Pp 196a7bff744SjmcThe lines in the 197a7bff744Sjmc.Pa Entries 198a7bff744Sjmcfile can be in any order. 199a7bff744Sjmc.It Pa CVS/Repository 200a7bff744SjmcFile containing the path to the corresponding directory in the 201a7bff744Sjmcsource repository. 202a7bff744Sjmc.It Pa CVS/Root 203a7bff744SjmcFile containing the value of the 204a7bff744Sjmc.Ev CVSROOT 205a7bff744Sjmcvariable at the time of checkout. 206a7bff744SjmcThis file is used by all 207a7bff744Sjmc.Nm 208a7bff744Sjmccommands instead of 209a7bff744Sjmc.Ev CVSROOT 210a7bff744Sjmconce 211a7bff744Sjmc.Nm 212a7bff744Sjmchas checked for its existence. 213a7bff744Sjmc.El 214a7bff744Sjmc.Pp 215a7bff744SjmcDepending on the circumstances, other files may exist in the 216a7bff744Sjmc.Pa CVS 217a7bff744Sjmcdirectory: 218a7bff744Sjmc.Bl -tag -width Ds 219a7bff744Sjmc.It Pa CVS/Base 220a7bff744SjmcIf pseudo-lock mode is enabled in client-server mode, 221a7bff744Sjmcthe 222a7bff744Sjmc.Pa Base 223a7bff744Sjmcdirectory contains a copy of the file on which the 224a7bff744Sjmc.Ic edit 225a7bff744Sjmccommand has been issued. 226a7bff744SjmcThis allows the 227a7bff744Sjmc.Ic unedit 228a7bff744Sjmccommand to operate even if the CVS server is unreachable. 229a7bff744Sjmc.It Pa CVS/Baserev 230a7bff744SjmcFile listing the revisions for each file contained in the 231a7bff744Sjmc.Pa Base 232a7bff744Sjmcdirectory under the following format: 233a7bff744Sjmc.Pp 234a7bff744Sjmc.Dl name/revision/ 235a7bff744Sjmc.It Pa CVS/Baserev.tmp 236a7bff744SjmcTemporary file used to write 237a7bff744Sjmc.Pa CVS/Baserev 238a7bff744Sjmccontent then atomically renamed to 239a7bff744Sjmc.Pa Baserev . 240a7bff744Sjmc.It Pa CVS/Checkin.prog 241a7bff744SjmcFile containing the path to the command specified with the 242a7bff744Sjmc.Fl i 243a7bff744Sjmcoption in the 244a7bff744Sjmc.Pa CVSROOT/modules 245a7bff744Sjmcfile. 246a7bff744Sjmc.It Pa CVS/Entries.Backup 247a7bff744SjmcTemporary file used to write 248a7bff744Sjmc.Pa CVS/Entries 249a7bff744Sjmccontent then atomically renamed to 250a7bff744Sjmc.Pa Entries . 251a7bff744Sjmc.It Pa CVS/Entries.Static 252a7bff744SjmcTells 253a7bff744Sjmc.Nm 254a7bff744Sjmcto not add files to the directory unless the 255a7bff744Sjmc.Ic update 256a7bff744Sjmccommand is issued with the 257a7bff744Sjmc.Fl d 258a7bff744Sjmcoption. 259a7bff744Sjmc.It Pa CVS/Notify 260a7bff744SjmcFile containing the notifications that could not be sent to the 261a7bff744SjmcCVS server but will be sent at the next successful connection. 262a7bff744Sjmc.It Pa CVS/Notify.tmp 263a7bff744SjmcTemporary file used to write 264a7bff744Sjmc.Pa CVS/Notify 265a7bff744Sjmccontent then atomically renamed to 266a7bff744Sjmc.Pa Notify . 267a7bff744Sjmc.It Pa CVS/Tag 268a7bff744SjmcFile containing the symbolic revision that was used at checkout. 269a7bff744SjmcThe first character of the line is a single letter indicating the 270a7bff744Sjmctype of tag: 271a7bff744Sjmc.Sq D , 272a7bff744Sjmc.Sq N , 273a7bff744Sjmcor 274a7bff744Sjmc.Sq T , 275a7bff744Sjmcfor date, non-branch tag, or branch tag, respectively. 276a7bff744SjmcThe rest of the line is the tag or date itself. 277a7bff744SjmcThe 278a7bff744Sjmc.Pa Tag 279a7bff744Sjmcfile should not be removed manually: 280a7bff744Sjmcinstead, use 281a7bff744Sjmc.Dq update -A . 282a7bff744Sjmc.It Pa CVS/Template 283a7bff744SjmcFile containing the template specified by the 284a7bff744Sjmc.Pa CVSROOT/rcsinfo 285a7bff744Sjmcfile. 286a7bff744SjmcIt is only used in client-server mode. 287a7bff744SjmcLocally, 288a7bff744Sjmc.Nm 289a7bff744Sjmcuses the 290a7bff744Sjmc.Pa rcsinfo 291a7bff744Sjmcfile directly. 292a7bff744Sjmc.It Pa CVS/Update.prog 293a7bff744SjmcFile containing the path to the command specified with the 294a7bff744Sjmc.Fl u 295a7bff744Sjmcoption in the 296a7bff744Sjmc.Pa CVSROOT/modules 297a7bff744Sjmcfile. 298a7bff744Sjmc.It Pa CVS/<name>,t 299a7bff744SjmcFile containing the description of the file 300a7bff744Sjmc.Pa file 301a7bff744Sjmcthat has been added with the 302a7bff744Sjmc.Ic add 303a7bff744Sjmccommand. 304a7bff744SjmcThis description is used by 305a7bff744Sjmc.Nm 306a7bff744Sjmcwhen archiving this file with the 307a7bff744Sjmc.Ic commit 308a7bff744Sjmccommand. 309a7bff744Sjmc.It Pa $HOME/.cvsignore 310a7bff744SjmcThis file provides a list of files (or 311a7bff744Sjmc.Xr sh 1 312a7bff744Sjmcfile name patterns) that should be ignored by 313a7bff744Sjmc.Xr cvs 1 314a7bff744Sjmcduring the 315a7bff744Sjmc.Ic import , 316a7bff744Sjmc.Ic release , 317a7bff744Sjmcand 318a7bff744Sjmc.Ic update 319a7bff744Sjmccommands. 320a7bff744Sjmc.Pp 321a7bff744SjmcThe syntax of the 322a7bff744Sjmc.Nm 323a7bff744Sjmcfile consists of a series of lines, each of which contains a 324a7bff744Sjmcspace-separated list of filenames. 325a7bff744SjmcThere is currently no way of using comments in this file. 326a7bff744Sjmc.Pp 327a7bff744SjmcDefault patterns that are ignored by 328a7bff744Sjmc.Xr cvs 1 329a7bff744Sjmcare as follows: 330a7bff744Sjmc.Bd -filled 331a7bff744SjmcCVS, 332a7bff744SjmcRCS, 333a7bff744SjmcRCSLOG, 334a7bff744SjmcSCCS, 335a7bff744SjmcTAGS, 336a7bff744Sjmctags, 337a7bff744Sjmccore, 338a7bff744Sjmccvslog*, 339a7bff744Sjmc*.o, 340a7bff744Sjmc*.so, 341a7bff744Sjmc*.a, 342a7bff744Sjmc*.bak, 343a7bff744Sjmc*.orig, 344a7bff744Sjmc*.rej, 345a7bff744Sjmc*.old, 346a7bff744Sjmc*.exe, 347a7bff744Sjmc*.depend, 348a7bff744Sjmc*.obj, 349a7bff744Sjmc*.elc, 350a7bff744Sjmc*.ln, 351a7bff744Sjmc*.olb, 352a7bff744Sjmc*.core, 353e62f2403Sjmc\&.#*, 354a7bff744Sjmc*~, 355a7bff744Sjmc_$*, 356a7bff744Sjmc*$, 357a7bff744Sjmc#*, 358a7bff744Sjmc,*. 359a7bff744Sjmc.Ed 360a7bff744Sjmc.Pp 361a7bff744SjmcThe list can be modified using the methods described below: 362a7bff744Sjmc.Pp 363a7bff744Sjmc.Bl -enum -compact 364a7bff744Sjmc.It 365a7bff744SjmcThe 366a7bff744Sjmc.Pa $CVSROOT/CVSROOT/cvsignore 367a7bff744Sjmcfile appends patterns to ignore for the whole repository. 368a7bff744Sjmc.It 369a7bff744SjmcThe 370a7bff744Sjmc.Pa $HOME/.cvsignore 371a7bff744Sjmcfile appends patterns to ignore for user only. 372a7bff744Sjmc.It 373a7bff744SjmcThe content of the 374a7bff744Sjmc.Ev CVSIGNORE 375a7bff744Sjmcvariable is appended to the list. 376a7bff744Sjmc.It 377a7bff744SjmcOptions to the command line 378a7bff744Sjmc.Fl I 379a7bff744Sjmcflag, available for the 380a7bff744Sjmc.Ic import 381a7bff744Sjmcand 382a7bff744Sjmc.Ic update 383a7bff744Sjmccommands, appends patterns for the current command line action only. 384a7bff744Sjmc.It 385a7bff744Sjmc.Pa .cvsignore 386a7bff744Sjmcfiles placed in the repository directories allow to add patterns to 387a7bff744Sjmcignore locally. 388a7bff744SjmcThey do not take effect on sub-directories. 389a7bff744Sjmc.El 390a7bff744Sjmc.Pp 391a7bff744SjmcThe 392a7bff744Sjmc.Sq !\& 393a7bff744Sjmccharacter can be used to reset the list of patterns using any of these 394a7bff744Sjmcfive methods. 395a7bff744Sjmc.Pp 396a7bff744SjmcFor the 397a7bff744Sjmc.Ic update 398a7bff744Sjmccommand, 399a7bff744Sjmc.Xr cvs 1 400a7bff744Sjmchandles files that are already present in the repository even if they 401a7bff744Sjmcare in the list to ignore. 402a7bff744SjmcFiles that are in the list to ignore but not in the repository will not 403a7bff744Sjmcbe listed. 404a7bff744SjmcThis way, files preceded by the 405a7bff744Sjmc.Sq ?\& 406a7bff744Sjmccharacter will not appear even if they should. 407a7bff744Sjmc.It Pa $HOME/.cvsrc 408a7bff744SjmcThis file provides a way to give the 409a7bff744Sjmc.Xr cvs 1 410a7bff744Sjmcprogram implicit global options and command-specific options. 411a7bff744SjmcUnless the 412a7bff744Sjmc.Fl f 413a7bff744Sjmcoption is specified, 414a7bff744Sjmc.Xr cvs 1 415a7bff744Sjmcreads its startup configuration file 416a7bff744Sjmc.Pa .cvsrc 417a7bff744Sjmcfrom the home directory of the user who invoked it. 418a7bff744Sjmc.Pp 419a7bff744SjmcThe format of each line is as follows: 420a7bff744Sjmc.Pp 421a7bff744Sjmc.Dl command [arg ...] 422a7bff744Sjmc.Pp 423a7bff744Sjmcwhere 424a7bff744Sjmc.Ar command 425a7bff744Sjmcis either the 426a7bff744Sjmc.Sq cvs 427a7bff744Sjmckeyword to specify global options, one of the supported 428a7bff744Sjmc.Xr cvs 1 429a7bff744Sjmccommands or a command alias. 430a7bff744SjmcArguments following 431a7bff744Sjmc.Ar command 432a7bff744Sjmcwill be added implicitly to the appropriate command's argument vector if it is 433a7bff744Sjmcrun. 434a7bff744SjmcLines whose 435a7bff744Sjmc.Ar command 436a2bdf3e3Stobiasargument is not a valid command will generate a warning when running with 437a7bff744Sjmcthe 438a2bdf3e3Stobias.Fl V 439a2bdf3e3Stobiasflag. 440a7bff744Sjmc.Pp 441c70dac2bStobiasEmpty lines are ignored. 442a7bff744SjmcA line beginning with a hash character 443a7bff744Sjmc.Pq Sq # 444a7bff744Sjmcis considered a comment and ignored. 445a7bff744Sjmc.Pp 446a7bff744SjmcFor example, to specify that 447a7bff744Sjmc.Xr cvs 1 448a7bff744Sjmcshould always run in quiet mode and the 449a7bff744Sjmc.Ic diff 450a7bff744Sjmcinternal command should always produce unified output: 451a7bff744Sjmc.Bd -literal -offset indent 452a7bff744Sjmccvs -q 453a7bff744Sjmcdiff -u 454a7bff744Sjmc.Ed 455a7bff744Sjmc.It Pa $HOME/.cvswrappers 456a7bff744SjmcThis file, located in 457a7bff744Sjmc.Pa $CVSROOT/CVSROOT 458a7bff744Sjmcand/or 459a7bff744Sjmc.Pa $HOME/.cvswrappers , 460a7bff744Sjmcprovides a way to configure filters for 461a7bff744Sjmc.Xr cvs 1 462a7bff744Sjmcbased on file type (name). 463a7bff744SjmcThis works by specifying a pattern to match for varying file types. 464a7bff744Sjmc.Pp 465a7bff744SjmcThe format of each line is as follows: 466a7bff744Sjmc.Pp 467a7bff744Sjmc.Dl pattern [option 'value'] [option 'value'] ... 468a7bff744Sjmc.Pp 469a7bff744SjmcThe following options are supported: 470a7bff744Sjmc.Bl -tag -width Ds 471a7bff744Sjmc.It Fl f Ar filter 472a7bff744SjmcExecute 473a7bff744Sjmc.Ar filter 474a7bff744Sjmcwhen the file is extracted from the repository (for the 475a7bff744Sjmc.Ic checkout , 476a7bff744Sjmc.Ic export , 477a7bff744Sjmcand 478a7bff744Sjmc.Ic update 479a7bff744Sjmccommands). 480a7bff744Sjmc.It Fl k Ar mode 481a7bff744SjmcSpecify the keyword substitution mode. 482*60addc80SjmcSee the KEYWORD SUBSTITUTION section of 483a7bff744Sjmc.Xr rcs 1 484a7bff744Sjmcfor more information. 485a7bff744Sjmc.It Fl m Ar method 486a7bff744SjmcSpecify the merge methodology to be used when a file is updated. 487a7bff744Sjmc.Pp 488a7bff744SjmcThe methods are as follows: 489a7bff744Sjmc.Bl -tag -width Ds 490a7bff744Sjmc.It COPY 491a7bff744SjmcWhen the 492a7bff744Sjmc.Ic update 493a7bff744Sjmccommand is used, 494a7bff744Sjmc.Xr cvs 1 495a7bff744Sjmcwill merely copy one version over another and let the user do the merge 496a7bff744Sjmcby himself. 497a7bff744SjmcThis method is used by default on binary files (see the 498a7bff744Sjmc.Fl k Ar b 499a7bff744Sjmcoption). 500a7bff744Sjmc.It MERGE 501a7bff744SjmcTry to merge the files. 502a7bff744SjmcThis method is the default. 503a7bff744Sjmc.El 504a7bff744Sjmc.It Fl t Ar filter 505a7bff744SjmcExecute 506a7bff744Sjmc.Ar filter 507a7bff744Sjmcbefore the file is archived in the repository (for the 508a7bff744Sjmc.Ic commit , 509a7bff744Sjmcand 510a7bff744Sjmc.Ic import 511a7bff744Sjmccommands). 512a7bff744Sjmc.El 513a7bff744Sjmc.It Pa $TMPDIR/cvs-serv Ns Aq Pa pid 514a7bff744SjmcTemporary directory created by the server where 515a7bff744Sjmc.Ar pid 516a7bff744Sjmcis the process ID of the server. 517a7bff744SjmcIt is located in the directory specified by the 518a7bff744Sjmc.Ev TMPDIR 519a7bff744Sjmcenvironment variable or the 520a7bff744Sjmc.Fl T 521a7bff744Sjmcglobal option. 522a7bff744SjmcSee above for more information. 523a7bff744Sjmc.El 524a7bff744Sjmc.Sh SEE ALSO 525a7bff744Sjmc.Xr cvs 1 , 526a7bff744Sjmc.Xr cvsintro 7 527