rcsmerge(1RCS) — UTek W2.3



RCSMERGE(1RCS)          COMMAND REFERENCE          RCSMERGE(1RCS)



NAME
     rcsmerge - merge RCS revisions

SYNOPSIS
     rcsmerge [ -p ] -rrev1 [ -rrev2 ] filename

DESCRIPTION
     Rcsmerge incorporates the changes between rev1 and rev2 of
     an RCS file into the corresponding working file. If -p is
     given, the result is printed on the std. output; otherwise
     the result overwrites the working file.

     A filename ending in ,v is an RCS filename; otherwise it is
     considered a working filename.  Rcsmerge derives the working
     filename from the RCS filename and vice versa, as explained
     in co(1rcs). A pair consisting of both an RCS and a working
     filename may also be specified.

     Rev1 cannot be omitted. If rev2 is omitted, the latest
     revision on the trunk is assumed.  Both rev1 and rev2 may be
     given numerically or symbolically.

     Rcsmerge prints a warning if there are overlaps, and
     delimits the overlapping regions as explained in co -j.  The
     command is useful for incorporating changes into a checked-
     out revision.

OPTIONS
     -p  Results are printed on std. output.

     -rrev1
         Revision rev1 is the first revision used in the merge.

     -rrev2
         Revision rev2 is the second revision used in the merge.
         Defaults to the latest revision on the trunk.

EXAMPLES
     Suppose you have released revision 2.8 of the file f.c.
     Assume furthermore that you just completed revision 3.4,
     when you receive updates to release 2.8 from someone else.
     To combine the updates to 2.8 and your changes between 2.8
     and 3.4, put the updates to 2.8 into file f.c and execute



          rcsmerge -p -r2.8 -r3.4 f.c >f.merged.c


     Then examine f.merged.c.  Alternatively, if you want to save
     the updates to 2.8 in the RCS file, check them in as
     revision 2.8.1.1 and execute co -j:



Printed 10/17/86                                                1



RCSMERGE(1RCS)          COMMAND REFERENCE          RCSMERGE(1RCS)





          ci -r2.8.1.1 f.c
          co -r3.4 -j2.8:2.8.1.1 f.c


     As another example, the following command undoes the changes
     between revision 2.4 and 2.8 in your currently checked out
     revision in f.c.



          rcsmerge -r2.8 -r2.4 f.c


     Note the order of the arguments, and that f.c will be
     overwritten.

FILES
     /tmp/d3[abc]$$           Temporary files for merging. $$ is
                              current process id.

     ,RCSt1$$                 Temporary storage for revisions
                              being merged.

RETURN VALUE
     [NO_ERRS]      Command completed without error.

     [NP_ERR]       An error occurred that was not a system
                    error.  Execution terminated.

CAVEATS
     Rcsmerge does not work for files that contain lines with a
     single dot (.).

     Rcsmerge uses merge(1rcs), so modifications to merge may
     result in problems with rcsmerge.

     The maximum number of revisions that can be stored in a
     single RCS file is 719. When there are more than 700
     revisions in a file, a warning message is printed on the
     terminal (if possible) every time an RCS command works on
     the file. See the manual page for rcsfile(5rcs) for
     information on what action to take in this case.

     On older versions of RCS, the maximum number of revisions
     that can be stored in a single RCS file is 239.  No warning
     message is displayed on the terminal if this number is
     exceeded.

SEE ALSO
     ci(1rcs), co(1rcs), ident(1rcs), merge(1rcs), rlog(1rcs),



Printed 10/17/86                                                2



RCSMERGE(1RCS)          COMMAND REFERENCE          RCSMERGE(1RCS)



     rcs(1rcs), rcsdiff(1rcs), rcsintro(1rcs), rcsfile(5rcs).






















































Printed 10/17/86                                                3

%%index%%
na:72,66;
sy:138,222;
de:360,1238;
op:1598,380;
ex:1978,639;2761,346;
fi:3107,293;
rv:3400,244;
ca:3644,1018;
se:4662,190;4996,195;
%%index%%000000000165

Museum

Related Articles