1 2 3 4RCSMERGE(1L) RCSMERGE(1L) 5 6 7NNAAMMEE 8 rcsmerge - merge RCS revisions 9 10SSYYNNOOPPSSIISS 11 rrccssmmeerrggee --rr_r_e_v_1 [ --rr_r_e_v_2 ] [ --pp ] file 12 13DDEESSCCRRIIPPTTIIOONN 14 _R_c_s_m_e_r_g_e incorporates the changes between _r_e_v_1 and _r_e_v_2 of 15 an RCS file into the corresponding working file. If --pp is 16 given, the result is printed on the standard output, 17 otherwise the result overwrites the working file. 18 19 A file name ending in ',v' is an RCS file name, otherwise 20 a working file name. _M_e_r_g_e derives the working file name 21 from the RCS file name and vice versa, as explained in 22 _c_o(1L). A pair consisting of both an RCS and a working 23 file name may also be specified. 24 25 _R_e_v_1 may not be omitted. If _r_e_v_2 is omitted, the latest 26 revision on the default branch (normally the highest 27 branch on the trunk) is assumed. Both _r_e_v_1 and _r_e_v_2 may 28 be given numerically or symbolically. 29 30 _R_c_s_m_e_r_g_e prints a warning if there are overlaps, and 31 delimits the overlapping regions as explained in _c_o -_j. 32 The command is useful for incorporating changes into a 33 checked-out revision. 34 35EEXXAAMMPPLLEESS 36 Suppose you have released revision 2.8 of f.c. Assume 37 furthermore that you just completed revision 3.4, when you 38 receive updates to release 2.8 from someone else. To 39 combine the updates to 2.8 and your changes between 2.8 40 and 3.4, put the updates to 2.8 into file f.c and execute 41 42 rrccssmmeerrggee --pp --rr22..88 --rr33..44 ff..cc >>ff..mmeerrggeedd..cc 43 44 Then examine f.merged.c. Alternatively, if you want to 45 save the updates to 2.8 in the RCS file, check them in as 46 revision 2.8.1.1 and execute _c_o -_j: 47 48 ccii --rr22..88..11..11 ff..cc 49 ccoo --rr33..44 --jj22..88::22..88..11..11 ff..cc 50 51 As another example, the following command undoes the 52 changes between revision 2.4 and 2.8 in your currently 53 checked out revision in f.c. 54 55 rrccssmmeerrggee --rr22..88 --rr22..44 ff..cc 56 57 Note the order of the arguments, and that f.c will be 58 overwritten. 59 60 61 62 63 64University Purdue 1 65 66 67 68 69 70RCSMERGE(1L) RCSMERGE(1L) 71 72 73IIDDEENNTTIIFFIICCAATTIIOONN 74 Author: Walter F. Tichy, Purdue University, West 75 Lafayette, IN, 47907. 76 Revision Number: 1.2 ; Release Date: 89/05/02 . 77 Copyright (C) 1982, 1988, 1989 by Walter F. Tichy. 78 79SSEEEE AALLSSOO 80 ci(1L), co(1L), merge(1L), ident(1L), rcs(1L), 81 rcsdiff(1L), rlog(1L), rcsfile(5L), 82 Walter F. Tichy, "Design, Implementation, and Evaluation 83 of a Revision Control System," in _P_r_o_c_e_e_d_i_n_g_s _o_f _t_h_e _6_t_h 84 _I_n_t_e_r_n_a_t_i_o_n_a_l _C_o_n_f_e_r_e_n_c_e _o_n _S_o_f_t_w_a_r_e _E_n_g_i_n_e_e_r_i_n_g, IEEE, 85 Tokyo, Sept. 1982. 86 87BBUUGGSS 88 _R_c_s_m_e_r_g_e does not work on files that contain lines with a 89 single `.'. 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 130University Purdue 2 131 132 133