MPE/iX Shell and Utilities Reference Manual, Vol 1

co(1) MPE/iX Shell and Utilities co(1)

rev2. co determines all the changes needed to change root into rev1 and applies

those changes to a copy of rev2. This is particularly useful if rev1 and rev2 are the

ends of two branches that have root as a common ancestor.

If rev1 < root < rev2 on the same branch, joining generates a new revision which is

like rev2 but with all changes that lead from rev1 to root undone. If changes from

root to rev1 overlap with changes from root to rev2, co prints a warning and includes

the overlapping sections, delimited by the lines:

<<<<<<< rev1

lines in rev1

=======

lines in rev2

>>>>>>> rev2

In the option -jjoinlist, joinlist is a comma-separated list of colon-separated pairs, of

the form root:rev2, where root and rev2 are (symbolic or numeric) revision numbers.

For the initial pair in the joinlist, rev1 is taken to be the revision selected by previous

options to the co command, such as –r, –l, etc. For later pairs in the list, rev1 is the

revision generated by the previous pair. The output of one join becomes the input to

the next.

For the initial pair in the list, root may be omitted. The default is the latest common

ancestor of rev1 and rev2. If any of the arguments indicate branches, the latest revi-

sions on those branches are assumed. The options –l and –u lock or unlock rev1.

–K suppresses keyword expansion and removes all existing expansions. This option

takes precedence over the –k option.

–k suppresses keyword expansion, even if KeywordExpand is speciﬁed in the conﬁ-

guration ﬁle. This is useful for non-readable binary ﬁles such as object ﬁles.

–l[rev]

same as –r, except that it also locks the retrieved revision for the person checking

out the ﬁle. See –r for handling of the revision number rev.

–O ignores any default options found in the local conﬁguration ﬁle.

–p[rev]

prints the retrieved revision on the standard output rather than storing it in the work-

ing ﬁle. This option is useful when co is part of a pipeline.

–q[rev]

quiet mode; diagnostics are not printed.

Commands and Utilities 1-111