1.\" $OpenBSD: rcsmerge.1,v 1.15 2010/09/03 11:09:29 jmc Exp $ 2.\" 3.\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> 4.\" All rights reserved. 5.\" 6.\" Permission to use, copy, modify, and distribute this software for any 7.\" purpose with or without fee is hereby granted, provided that the above 8.\" copyright notice and this permission notice appear in all copies. 9.\" 10.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17.Dd $Mdocdate: September 3 2010 $ 18.Dt RCSMERGE 1 19.Os 20.Sh NAME 21.Nm rcsmerge 22.Nd merge RCS revisions 23.Sh SYNOPSIS 24.Nm 25.Op Fl EV 26.Op Fl k Ns Ar mode 27.Op Fl p Ns Op Ar rev 28.Op Fl q Ns Op Ar rev 29.Op Fl x Ns Ar suffixes 30.Op Fl z Ns Ar tz 31.Fl r Ns Ar rev 32.Ar 33.Sh DESCRIPTION 34The 35.Nm 36program merges changes between two revisions of an RCS file into 37the corresponding working file. 38.Pp 39.Nm 40also supports 41keyword substitution \(en 42see the 43.Xr rcs 1 44man page for more information. 45.Pp 46The following options are supported: 47.Bl -tag -width Ds 48.It Fl E 49Default merge: 50see 51.Xr diff3 1 52for details. 53.It Fl k Ns Ar mode 54Specify the keyword substitution mode. 55.It Fl p Ns Op Ar rev 56Print result to standard output. 57.It Fl q Ns Op Ar rev 58Be quiet about reporting. 59.It Fl r Ns Ar rev 60Merge with respect to revision 61.Ar rev . 62This option should be specified twice to merge changes 63between two specific revisions. 64If only one revision is specified, 65merging is done between that revision and 66the latest revision of the default branch. 67.It Fl V 68Print RCS's version number. 69.It Fl x Ns Ar suffixes 70Specify the suffixes for RCS files. 71Suffixes should be separated by the 72.Sq / 73character. 74.It Fl z Ns Ar tz 75Specify the time zone for keyword substitution. 76.El 77.Sh ENVIRONMENT 78.Bl -tag -width RCSINIT 79.It Ev RCSINIT 80If set, this variable should contain a list of space-delimited options that 81are prepended to the argument list. 82.El 83.Sh EXIT STATUS 84The 85.Nm 86utility exits with one of the following values: 87.Pp 88.Bl -tag -width Ds -offset indent -compact 89.It 0 90No overlaps. 91.It 1 92Overlaps were found. 93.It 2 94An error occurred. 95.El 96.Sh EXAMPLES 97Merge differences between revision 1.4 and 1.8 of 98.Pa foo.c 99and print the result to standard output: 100.Pp 101.Dl $ rcsmerge -p -r1.4 -r1.8 foo.c 102.Pp 103Undo changes between revision 2.4 and 2.8 of 104.Pa foo.c , 105overwriting the working copy: 106.Pp 107.Dl $ rcsmerge -r2.8 -r2.4 foo.c 108.Sh SEE ALSO 109.Xr ci 1 , 110.Xr co 1 , 111.Xr ident 1 , 112.Xr merge 1 , 113.Xr rcs 1 , 114.Xr rcsclean 1 , 115.Xr rcsdiff 1 , 116.Xr rlog 1 117.Sh STANDARDS 118The flags 119.Op Fl AeT 120have no effect and are provided 121for compatibility only. 122