\documentstyle{report}
\input cyracc.def
\font\tencyr=wncyr10
\def\cyr{\tencyr\cyracc}
\date{}
\textheight 24.0cm
\textwidth 15.cm
\topmargin -2cm
\oddsidemargin .05cm
\title{Revision Control System\\IN RUSSIAN}
\begin{document}
\maketitle
\tt
\emergencystretch=5pt

\chapter{RCSINTRO(1)}

~

{\cyr NA\-Z\-VA\-N\-IE

ob\-zor si\-s\-te\-my} RCS - {\cyr vve\-de\-n\-ie v Si\-s\-te\-mu
Ot\-s\-le\-zhi\-va\-ni\-ya Ve\-r\-si{\u i}

OPI\-SA\-N\-IE}

RCS (Re\-vi\-s\-ion Co\-n\-t\-rol System) {\cyr
pre\-d\-s\-ta\-v\-l\-yaet so\-bo{\u i} si\-s\-te\-mu
ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}
iz\-me\-n\-ya\-yu\-shchi\-kh\-s\-ya te\-k\-s\-to\-vykh ili
so\-s\-to\-ya\-shchikh iz strok dvo\-i\-chnykh fa{\u i}\-lov, kak tekst
na ru\-s\-s\-kom ya\-z\-y\-ke (o pro\-chikh -- sm. flag} -kb {\cyr
ko\-ma\-n\-dy} co{\cyr ) fa{\u i}\-lov.} RCS {\cyr
av\-to\-ma\-ti\-zi\-r\-uet ar\-khi\-vi\-ro\-va\-n\-ie (ne
pu\-tat{\cprime} so szha\-t\-iem!), vo\-s\-t\-re\-bo\-va\-n\-ie,
re\-gi\-s\-t\-ra\-ci\-yu iz\-me\-ne\-ni{\u i},
ide\-n\-ti\-fi\-ka\-ci\-yu i sra\-v\-ne\-n\-ie fa{\u i}\-lov, a
ta\-k\-zhe vne\-se\-n\-ie iz\-me\-ne\-ni{\u i} v do\-ku\-ment,
iz\-me\-ne\-n\-ny{\u i} dru\-gi\-mi za vre\-m\-ya va\-she{\u i}
ra\-bo\-ty.} RCS {\cyr po\-le\-z\-na dlya ra\-bo\-ty s cha\-s\-to
iz\-me\-n\-ya\-yu\-shchi\-mi\-s\-ya do\-ku\-me\-n\-ta\-mi,
na\-p\-ri\-mer, pro\-g\-ra\-m\-ma\-mi v pro\-ce\-s\-se
ra\-z\-ra\-bo\-t\-ki, te\-kh\-ni\-che\-s\-ko{\u i}
do\-ku\-me\-n\-ta\-c\-ie{\u i}, na\-u\-ch\-n\-ymi
stat{\cprime}\-ya\-mi, de\-lo\-vo{\u i} pe\-re\-pi\-s\-ko{\u i},
sbo\-r\-ni\-ka\-mi in\-stru\-k\-ci{\u i}, i su\-shche\-s\-t\-ve\-n\-no
ob\-le\-g\-ch\-aet ra\-bo\-tu s bol{\cprime}\-shi\-mi
si\-s\-te\-ma\-mi, v oso\-be\-n\-no\-s\-ti, es\-li iz\-me\-ne\-ni\-ya v
do\-ku\-me\-n\-ty vno\-s\-yat ra\-z\-n\-ye lyu\-di.

Vza\-i\-mo\-de{\u i}\-stvie s pol{\cprime}\-zo\-va\-te\-lem
chre\-z\-v\-y\-cha{\u i}\-no pro\-s\-to. No\-vi\-ch\-ku
do\-s\-ta\-to\-ch\-no znat{\cprime} dve ko\-ma\-n\-dy:} ci {\cyr i} co.

ci - {\cyr so\-k\-ra\-shche\-n\-ie ot "}check in" = "{\cyr
re\-gi\-s\-t\-ra\-ci\-ya" (v tom smysle, v ka\-kom
po\-ni\-m\-aet\-s\-ya re\-gi\-s\-t\-ra\-ci\-ya na sa\-mo\-let) -
po\-me\-shch\-aet so\-de\-r\-zhi\-m\-oe ra\-bo\-che\-go fa{\u i}\-la v
ar\-khi\-v\-ny{\u i} fa{\u i}l, khra\-n\-ya\-shchi{\u i}
pre\-d\-y\-du\-shch\-ie ego ve\-r\-s\-ii (to\-ch\-n\-ee,
iz\-me\-ne\-ni\-ya me\-zh\-du ve\-r\-si\-ya\-mi) i
na\-z\-y\-v\-ae\-my{\u i} ta\-k\-zhe} RCS-{\cyr fa{\u i}\-lom.}

co - {\cyr so\-k\-ra\-shche\-n\-ie ot "}check out" {\cyr
pre\-d\-s\-ta\-v\-l\-ya\-yut so\-bo{\u i} ne ob\-ra\-t\-ny{\u i}
pro\-cess is\-klyu\-che\-ni\-ya, a po\-lu\-che\-n\-ie ko\-p\-ii
ne\-ko\-to\-ro{\u i} ve\-r\-s\-ii iz} RCS-{\cyr ar\-khi\-va.

FU\-N\-K\-C\-II} RCS

$\star$ {\cyr Khra\-nit{\cprime} mno\-zhe\-s\-t\-ve\-n\-n\-ye
ve\-r\-s\-ii te\-k\-s\-to\-vykh do\-ku\-me\-n\-tov.} RCS {\cyr
khra\-nit sta\-r\-ye ve\-r\-s\-ii fa{\u i}\-la,
is\-pol{\cprime}\-zu\-ya go\-ra\-z\-do men{\cprime}\-she me\-s\-ta,
chem ko\-m\-p\-re\-s\-si\-ru\-yu\-shch\-ie pro\-g\-ra\-m\-my,
po\-s\-kol{\cprime}\-ku e{\u i} do\-s\-ta\-to\-ch\-no lish{\cprime}
opi\-sat{\cprime} vne\-se\-n\-n\-ye iz\-me\-ne\-ni\-ya.

Iz\-me\-ne\-ni\-ya, vne\-se\-n\-n\-ye v do\-ku\-ment, ne po\-r\-t\-yat
ori\-gi\-na\-la, sta\-r\-ye ve\-r\-s\-ii os\-ta\-yut\-s\-ya
do\-s\-tu\-p\-ny dlya iz\-vle\-che\-ni\-ya. Ikh mo\-zh\-no
ra\-z\-y\-s\-ki\-vat{\cprime} po no\-me\-ram ve\-r\-si{\u i},
klyu\-che\-vym si\-m\-vo\-lam (si\-m\-vol{\cprime}\-nym
pe\-re\-me\-n\-nym), da\-tam, av\-to\-ram i t.p.

$\star$ Khra\-nit{\cprime} is\-to\-ri\-yu iz\-me\-ne\-ni{\u i}.} RCS
{\cyr de\-l\-aet \`eto av\-to\-ma\-ti\-che\-s\-ki. Kro\-me sa\-mikh
iz\-me\-ne\-ni{\u i} te\-k\-s\-ta, vno\-s\-yat\-s\-ya ta\-k\-zhe
da\-ta, im\-ya (to\-ch\-n\-ee,} lo\-gin na\-me{\cyr ) av\-to\-ra,
da\-ta i vre\-m\-ya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i}, i,
ta\-k\-zhe, kra\-t\-k\-ie ko\-m\-me\-n\-ta\-r\-ii,
opi\-s\-y\-va\-yu\-shch\-ie sut{\cprime} vne\-se\-n\-nykh
iz\-me\-ne\-ni{\u i}. \`Eta, svo\-e\-go ro\-da, le\-to\-pis{\cprime},
po\-z\-vo\-l\-yaet bystro po\-n\-yat{\cprime}, chto
pro\-i\-s\-kho\-di\-lo s do\-ku\-me\-n\-tom bez tru\-do\-e\-m\-ko\-go
sra\-v\-ne\-ni\-ya ra\-s\-pe\-cha\-tok i op\-ro\-sa
ra\-bo\-ta\-v\-shikh s te\-k\-s\-tom so\-t\-ru\-d\-ni\-kov.

$\star$ Vno\-sit ya\-s\-nost{\cprime} v pro\-b\-le\-mu do\-s\-tu\-pa
ne\-s\-kol{\cprime}\-kikh lyu\-de{\u i} k od\-no\-mu i to\-mu zhe
te\-k\-s\-tu. Ko\-g\-da ra\-z\-n\-ye lyu\-di pyta\-yut\-s\-ya
po\-lu\-chit{\cprime} do\-s\-tup ko vne\-se\-ni\-yu iz\-me\-ne\-ni{\u
i} od\-no\-v\-re\-me\-n\-no,} RCS {\cyr pre\-du\-p\-re\-zh\-d\-aet ikh
i pre\-do\-t\-v\-ra\-shch\-aet za\-ti\-ra\-n\-ie tol{\cprime}\-ko chto
vne\-se\-n\-nykh iz\-me\-ne\-ni{\u i}.

$\star$ Po\-d\-de\-r\-zhi\-v\-aet ce\-l\-oe de\-re\-vo ve\-r\-si{\u i}.
Es\-li nad od\-nim do\-ku\-me\-n\-tom ra\-bo\-t\-aet
od\-no\-v\-re\-me\-n\-no ne\-s\-kol{\cprime}\-ko che\-lo\-vek,} RCS
{\cyr mo\-zhet po\-d\-de\-r\-zhi\-vat{\cprime}
ra\-z\-del{\cprime}\-n\-ye li\-n\-ii ra\-z\-vi\-ti\-ya od\-no\-go
do\-ku\-me\-n\-ta, so\-kh\-ra\-n\-ya\-ya ikh v stru\-k\-tu\-re
ot\-ra\-zha\-yu\-shche{\u i} ot\-no\-she\-n\-ie
"pre\-d\-she\-s\-t\-vo\-vat{\cprime}" me\-zh\-du ve\-r\-si\-ya\-mi.
De\-re\-vo mo\-zhet ot\-ra\-zhat{\cprime} lo\-kal{\cprime}\-n\-ye
ot\-li\-chi\-ya ve\-r\-si{\u i}, po\-s\-ta\-v\-l\-ya\-e\-mykh
ko\-n\-k\-re\-t\-nym za\-ka\-z\-chi\-kam, ot gla\-v\-no{\u i} li\-n\-ii
ra\-z\-vi\-ti\-ya.

$\star$ Ob{\cdprime}edi\-n\-yat{\cprime} pa\-ra\-l\-lel{\cprime}\-n\-ye
li\-n\-ii ra\-z\-vi\-ti\-ya od\-no\-go do\-ku\-me\-n\-ta,
pre\-do\-t\-v\-ra\-shcha\-ya ko\-n\-f\-li\-k\-ty.} RCS {\cyr de\-l\-aet
\`eto pro\-i\-z\-vo\-d\-ya "su\-m\-ma\-r\-n\-oe" iz\-me\-ne\-n\-ie.
Es\-li zhe vne\-se\-n\-n\-ye v dve li\-n\-ii iz\-me\-ne\-ni\-ya
za\-t\-ro\-nu\-li odin i tot zhe fra\-g\-ment ko\-da,} RCS {\cyr
pre\-du\-p\-re\-zh\-d\-aet pol{\cprime}\-zo\-va\-te\-l\-ya o
na\-lo\-zhe\-n\-ii iz\-me\-ne\-ni{\u i}. Tot zhe me\-kha\-nizm (sm.
flag} -j {\cyr ko\-ma\-n\-dy} co) {\cyr po\-z\-vo\-l\-yaet
ot\-me\-nit{\cprime} iz\-me\-ne\-n\-ie, vne\-se\-n\-n\-oe na od\-nom iz
pre\-d\-y\-du\-shchikh \`eta\-pov, so\-kh\-ra\-niv
is\-pra\-v\-le\-ni\-ya, sde\-la\-n\-n\-ye na
po\-s\-le\-du\-yu\-shchikh. \`Eto zhe po\-z\-vo\-l\-yaet
av\-to\-ma\-ti\-che\-s\-ki so\-z\-da\-vat{\cprime}
lo\-kal{\cprime}\-n\-ye ve\-r\-s\-ii iz no\-vo{\u i} gla\-v\-no{\u i} i
sta\-ro{\u i} lo\-kal{\cprime}\-no{\u i}.

$\star$ Up\-ra\-v\-l\-yat{\cprime} po\-d\-ra\-z\-de\-le\-n\-iem
ve\-r\-si{\u i} i ko\-n\-fi\-gu\-ra\-ci{\u i}. V do\-po\-l\-ne\-n\-ie k
to\-mu, chto vo\-z\-mo\-zh\-no vo\-s\-s\-ta\-no\-v\-le\-n\-ie
so\-s\-to\-ya\-n\-ie ot\-s\-le\-zhi\-va\-e\-mo{\u i} si\-s\-te\-my,
su\-shche\-s\-t\-vo\-va\-v\-sh\-ee v lyu\-bo{\u i} za\-da\-n\-ny{\u i}
mo\-ment, so\-o\-t\-vet\-s\-t\-ve\-n\-n\-ye ve\-r\-s\-ii vsekh fa{\u
i}\-lov mo\-gut byt{\cprime} po\-me\-che\-ny od\-nim i tem zhe
klyu\-che\-vym si\-m\-vo\-lom. Ve\-r\-s\-ii mo\-zhet byt{\cprime}
pri\-dan sta\-tus, obo\-z\-na\-cha\-yu\-shchi{\u i}, chto ona
ya\-v\-l\-yaet\-s\-ya \`ek\-spe\-ri\-me\-n\-tal{\cprime}\-no{\u i},
sta\-bil{\cprime}\-no{\u i}, ko\-m\-me\-r\-che\-s\-ko{\u i},
vypu\-s\-kom i dr. \`Eto po\-z\-vo\-l\-yaet pro\-s\-to i
ne\-d\-vu\-s\-m\-y\-s\-le\-n\-no opi\-s\-y\-vat{\cprime} \`eta\-py
ra\-z\-vi\-ti\-ya bol{\cprime}\-sho{\u i} si\-s\-te\-my,
so\-s\-to\-ya\-shche{\u i} iz mno\-gikh do\-ku\-me\-n\-tov.

$\star$ Av\-to\-ma\-ti\-che\-s\-ki
oto\-zh\-de\-s\-t\-v\-l\-yat{\cprime} ve\-r\-s\-ii po ime\-ni,
no\-me\-ru, vre\-me\-ni so\-z\-da\-ni\-ya, av\-to\-ru i t.p.
Ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye me\-t\-ki s klyu\-che\-v\-y\-mi
slo\-va\-mi, vsta\-v\-l\-ya\-yut\-s\-ya v op\-re\-de\-le\-n\-n\-ye
me\-s\-ta is\-to\-r\-ii iz\-me\-ne\-ni{\u i} fa{\u i}\-la. Ta\-ka\-ya
skhe\-ma po\-z\-vo\-l\-yaet le\-g\-ko vyya\-s\-nit{\cprime}, ka\-k\-ie
ve\-r\-s\-ii ka\-kikh mo\-du\-le{\u i} so\-s\-ta\-v\-l\-ya\-yut
da\-n\-nu\-yu ko\-n\-fi\-gu\-ra\-ci\-yu ili vypusk.

$\star$ Mi\-ni\-mi\-zi\-ro\-vat{\cprime} ne\-o\-b\-kho\-di\-m\-oe dlya
khra\-ne\-ni\-ya me\-s\-to. Dlya no\-vo{\u i} ve\-r\-s\-ii} RCS {\cyr
khra\-nit tol{\cprime}\-ko iz\-me\-ne\-ni\-ya
(po\-s\-t\-ro\-ch\-n\-ye). Uda\-le\-n\-ie pro\-me\-zhu\-to\-chnykh
ve\-r\-si{\u i} po\-z\-vo\-lit s\`eko\-no\-mit{\cprime} lish{\cprime}
na stro\-kakh, ko\-to\-r\-ye iz\-me\-n\-ya\-lis{\cprime}
ne\-s\-kol{\cprime}\-ko raz.

PE\-R\-V\-YE ShA\-GI V RA\-BO\-TE S} RCS

{\cyr Pre\-d\-po\-lo\-zhim, Vy kho\-ti\-te ot\-s\-le\-zhi\-vat{\cprime}
s po\-moshch{\cprime}\-yu} RCS {\cyr iz\-me\-ne\-ni\-ya fa{\u i}\-la}
f.c {\cyr . So\-z\-da{\u i}\-te v tom ka\-ta\-lo\-ge, gde
na\-kho\-dit\-s\-ya fa{\u i}l} f.c {\cyr , po\-d\-ka\-ta\-log} RCS ,

mkdir RCS

{\cyr a za\-tem za\-re\-gi\-s\-t\-ri\-ru{\u i}\-te ego:}

ci f.c

{\cyr \`Eta ko\-ma\-n\-da so\-z\-dast v po\-d\-ka\-ta\-lo\-ge} RCS
{\cyr ne\-ki{\u i} ar\-khi\-v\-ny{\u i} fa{\u i}l (} RCS/f.c,v {\cyr ,
es\-li ope\-ra\-ci\-o\-n\-na\-ya si\-s\-te\-ma
po\-d\-de\-r\-zhi\-v\-aet za\-p\-ya\-t\-ye v ime\-ni fa{\u i}\-la, i}
RCS/f.c {\cyr , es\-li -- net), po\-me\-s\-tit v ne\-go} f.c {\cyr v
ka\-che\-s\-t\-ve ve\-r\-s\-ii 1.1 i za\-p\-ro\-sit u vas
opi\-sa\-n\-ie fa{\u i}\-la -- chto on iz se\-b\-ya
pre\-d\-s\-ta\-v\-l\-yaet, za\-chem nu\-zhen i t.p. \`Eta
za\-pis{\cprime} bu\-det ot\-no\-sit{\cprime}\-s\-ya ko vsem
ve\-r\-si\-yam. Pri re\-gi\-s\-t\-ra\-c\-ii (vne\-se\-n\-ii)
po\-s\-le\-du\-yu\-shchikh iz\-me\-ne\-ni{\u i}} RCS {\cyr
za\-p\-ra\-shi\-v\-aet so\-o\-b\-shche\-n\-ie dru\-go\-go so\-r\-ta --
re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu za\-pis{\cprime} -- opi\-sa\-n\-ie
vne\-se\-n\-no\-go iz\-me\-ne\-ni\-ya, ko\-to\-r\-oe bu\-det
ot\-no\-sit{\cprime}\-s\-ya k da\-n\-no{\u i} ko\-n\-k\-re\-t\-no{\u i}
ve\-r\-s\-ii. \`Eti za\-pi\-si i so\-s\-ta\-v\-yat is\-to\-ri\-yu
iz\-me\-ne\-ni{\u i} fa{\u i}\-la.

V po\-d\-ka\-ta\-lo\-ge} RCS {\cyr na\-kho\-d\-yat\-s\-ya
ar\-khi\-v\-n\-ye ili} RCS-{\cyr fa{\u i}\-ly,
so\-o\-t\-vet\-s\-t\-vu\-yu\-shch\-ie na\-kho\-d\-ya\-shchi\-m\-s\-ya
uro\-v\-nem vyshe ra\-bo\-chim fa{\u i}\-lam. Dlya to\-go, chto\-by
vo\-s\-s\-ta\-no\-vit{\cprime} fa{\u i}l} f.c {\cyr iz
pre\-d\-y\-du\-shche\-go pri\-me\-ra, is\-pol{\cprime}\-zu{\u i}\-te
ko\-ma\-n\-du} co {\cyr :}

co f.c

{\cyr \`Eto ko\-ma\-n\-da vo\-s\-t\-re\-b\-uet v ra\-bo\-chi{\u i}
fa{\u i}l no\-ve{\u i}\-shu\-yu iz ve\-r\-si{\u i},
so\-de\-r\-zha\-shchi\-kh\-s\-ya v ar\-khi\-ve, no ne po\-z\-vo\-lit
ego iz\-me\-n\-yat{\cprime}. Es\-li zhe nu\-zh\-no ego
re\-da\-k\-ti\-ro\-vat{\cprime} dal{\cprime}\-she,
vo\-s\-s\-ta\-no\-vi\-te ego sno\-va, no za\-b\-ro\-ni\-ro\-vav ego
t.e. za\-k\-ryv dru\-gim do\-s\-tup dlya iz\-me\-ne\-ni\-ya:}

co -l f.c

{\cyr (} -l {\cyr --} "lock" {\cyr = "za\-pe\-ret{\cprime}").
Te\-per{\cprime} Vy mo\-zhe\-te re\-da\-k\-ti\-ro\-vat{\cprime}} f.c
{\cyr .

Pre\-d\-po\-lo\-zhim, po oko\-n\-cha\-n\-ii
re\-da\-k\-ti\-ro\-va\-ni\-ya Vy kho\-ti\-te oce\-nit{\cprime}
vne\-se\-n\-n\-ye iz\-me\-ne\-ni\-ya. Ko\-ma\-n\-da}

rcsdiff f.c

{\cyr so\-o\-b\-shchit Vam iz\-me\-ne\-ni\-ya fa{\u i}\-la po
sra\-v\-ne\-ni\-yu s ego po\-s\-le\-d\-ne{\u i}
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-no{\u i} ve\-r\-s\-ie{\u i} tak zhe,
kak \`eto de\-l\-aet ko\-ma\-n\-da} diff(1){\cyr . Za\-ne\-s\-ti
no\-vu\-yu ve\-r\-si\-yu v ar\-khiv mo\-zh\-no ko\-ma\-n\-do{\u i}}

ci f.c

{\cyr chto pri\-dast no\-vo{\u i} ve\-r\-s\-ii oche\-re\-d\-no{\u i}
po\-r\-ya\-d\-ko\-vy{\u i} no\-mer.

Pri re\-gi\-s\-t\-ra\-c\-ii vo\-z\-mo\-zh\-no so\-o\-b\-shche\-n\-ie ob
oshi\-b\-ke:}

ci er\-ror: no lock set by your\_na\-me

({\cyr oshi\-b\-ka re\-gi\-s\-t\-ra\-c\-ii: fa{\u i}l ne
za\-b\-ro\-ni\-ro\-van dlya im\-ya\-rek), \`eto oz\-na\-ch\-aet, chto
Vy pyta\-e\-tes{\cprime} za\-re\-gi\-s\-t\-ri\-ro\-vat{\cprime} fa{\u
i}l, ne ofo\-r\-miv pra\-vil{\cprime}\-no do\-s\-tup, t.e. ne
za\-k\-ryv dru\-gim do\-s\-tup k ne\-mu. Da\-zhe v pro\-s\-te{\u
i}\-shem slu\-ch\-ae, ko\-g\-da fa{\u i}l ne za\-k\-ryt ot Vas, uzhe
po\-z\-d\-no bro\-ni\-ro\-vat{\cprime} fa{\u i}l s
po\-moshch{\cprime}\-yu iz\-vle\-che\-ni\-ya ko\-ma\-n\-do{\u i}} co -l
, {\cyr po\-to\-mu, chto \`eto uni\-ch\-to\-zhit tol{\cprime}\-ko chto
sde\-la\-n\-n\-ye Va\-mi is\-pra\-v\-le\-ni\-ya. V ta\-kom slu\-ch\-ae
vo\-s\-pol{\cprime}\-zu{\u i}\-tes{\cprime} ko\-ma\-n\-do{\u i}}

rcs -l f.c

{\cyr \`Eto za\-re\-ze\-r\-vi\-r\-uet Vam dlya vne\-se\-ni\-ya
iz\-me\-ne\-ni{\u i} po\-s\-le\-d\-n\-yu\-yu
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-nu\-yu ve\-r\-si\-yu bez ee
iz\-vle\-che\-ni\-ya i, tem sa\-mym, ne za\-t\-ret eshche ne
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-ny{\u i} va\-r\-iant. Es\-li zhe
kto-to po\-mi\-mo Vas ra\-bo\-t\-aet nad fa{\u i}\-lom, Vy
po\-lu\-chi\-te so\-o\-b\-shche\-n\-ie ob oshi\-b\-ke i, v \`etom
slu\-ch\-ae, Vam pri\-det\-s\-ya do\-go\-va\-ri\-vat{\cprime}\-s\-ya s
\`etim li\-com (ili na\-chi\-nat{\cprime} no\-vu\-yu vetv{\cprime} --
es\-li Vy ra\-bo\-ta\-e\-te nad ra\-z\-n\-y\-mi stro\-ka\-mi
te\-k\-s\-ta, ko\-n\-f\-likt Vash mo\-zhet byt{\cprime} le\-g\-ko
ra\-z\-re\-shen po\-z\-d\-n\-ee ko\-ma\-n\-do{\u i}} rcsmerge {\cyr ).

Bro\-ni\-ro\-va\-n\-ie ga\-ra\-n\-ti\-r\-uet, chto ni\-k\-to, kro\-me
Vas ne smo\-zhet za\-re\-gi\-s\-t\-ri\-ro\-vat{\cprime}
sle\-du\-yu\-shchu\-yu ve\-r\-si\-yu i, ta\-kim spo\-so\-bom
po\-z\-vo\-l\-yaet iz\-be\-zhat{\cprime} pro\-b\-lem, ko\-g\-da
iz\-me\-ne\-ni\-ya vno\-s\-yat\-s\-ya ra\-z\-n\-y\-mi
lyud{\cprime}\-mi. Es\-li ve\-r\-si\-ya za\-b\-ro\-ni\-ro\-va\-na, ee
vse ra\-v\-no mo\-zh\-no iz\-vle\-kat{\cprime} dlya chte\-ni\-ya ili
ko\-m\-pi\-l\-ya\-c\-ii. Ob\-ya\-za\-tel{\cprime}\-no
bro\-ni\-ro\-vat{\cprime} fa{\u i}l, nu\-zh\-no tol{\cprime}\-ko dlya
iz\-me\-ne\-ni\-ya.

Es\-li Vy -- edi\-n\-s\-t\-ve\-n\-ny{\u i} che\-lo\-vek,
ra\-bo\-ta\-yu\-shchi{\u i} s fa{\u i}\-lom, to Vy mo\-zhe\-te
ot\-klyu\-chit{\cprime} ko\-n\-t\-rol{\cprime} bro\-ni\-ro\-va\-ni\-ya
ko\-n\-k\-re\-t\-no\-go fa{\u i}\-la, to\-g\-da Vam ne
po\-t\-re\-b\-uet\-s\-ya ka\-zhdy{\u i} raz ego
za\-k\-r\-y\-vat{\cprime}. Sde\-lat{\cprime} re\-zhim
bro\-ni\-ro\-va\-ni\-ya stro\-gim ili ne\-s\-t\-ro\-gim, mo\-zh\-no
ko\-ma\-n\-do{\u i}}

rcs -U f.c {\cyr li\-bo} rcs -L f.c

{\cyr V ko\-ma\-n\-dakh, upo\-m\-ya\-nu\-tykh vyshe, mo\-zh\-no
uka\-z\-y\-vat{\cprime} i ar\-khiv i ra\-bo\-chi{\u i} fa{\u i}l, a
mo\-zh\-no, tol{\cprime}\-ko odin iz nikh. V po\-s\-le\-d\-nem
slu\-ch\-ae} RCS {\cyr sna\-cha\-la ishchet ar\-khiv v
po\-d\-ka\-ta\-lo\-ge} RCS {\cyr , za\-tem v tom zhe ka\-ta\-lo\-ge,
chto i za\-da\-n\-ny{\u i} ra\-bo\-chi{\u i} fa{\u i}l; poisk zhe
ra\-bo\-che\-go fa{\u i}\-la na\-chi\-n\-aet\-s\-ya s te\-ku\-shche\-go
ka\-ta\-lo\-ga. Udo\-b\-n\-ee de\-r\-zhat{\cprime} ar\-khi\-vy v
po\-d\-ka\-ta\-lo\-ge} RCS {\cyr i ne za\-g\-ro\-mo\-zh\-dat{\cprime}
ka\-ta\-log s ra\-bo\-chi\-mi fa{\u i}\-la\-mi. (V ve\-r\-s\-ii,
sko\-m\-pi\-li\-ro\-va\-n\-no{\u i} dlya} MS-DOS, {\cyr \`eto
ne\-o\-b\-kho\-di\-mo iz-za ne\-vo\-z\-mo\-zh\-no\-s\-ti
do\-ba\-vit{\cprime} ar\-khi\-v\-ny{\u i} su\-f\-fiks k ime\-ni
ra\-bo\-che\-go fa{\u i}\-la.)

Es\-li Vy kho\-ti\-te iz\-be\-zhat{\cprime} uda\-le\-ni\-ya
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-no\-go fa{\u i}\-la, (chto\-by,
na\-p\-ri\-mer, ko\-m\-pi\-li\-ro\-vat{\cprime} ego), mo\-zh\-no
vo\-s\-pol{\cprime}\-zo\-vat{\cprime}\-s\-ya fla\-ga\-mi}

ci -l f.c {\cyr ili} ci -u f.c

{\cyr Obe fo\-r\-my re\-gi\-s\-t\-ri\-ru\-yut fa{\u i}l, ne
uda\-l\-ya\-ya ego i \`eko\-no\-m\-yat, tem sa\-mym, od\-nu
ope\-ra\-ci\-yu vo\-s\-s\-ta\-no\-v\-le\-ni\-ya. Pe\-r\-vy{\u i}
va\-r\-iant ne ot\-kryvaet fa{\u i}\-la dlya dru\-gikh, i udo\-ben,
es\-li Vy pro\-do\-l\-zha\-e\-te ego, re\-da\-k\-ti\-ro\-vat{\cprime};
vto\-ro{\u i} udo\-ben, es\-li Vy za\-ko\-n\-chi\-li ra\-bo\-tu s fa{\u
i}\-lom; no oba ne iz\-me\-n\-yat ofi\-c\-ial{\cprime}\-no\-go
ra\-bo\-che\-go fa{\u i}\-la, es\-li Vy re\-gi\-s\-t\-ri\-ru\-e\-te
fa{\u i}l iz tret{\cprime}\-e\-go me\-s\-ta (uka\-zav put{\cprime} k
ob\-oim fa{\u i}\-lam ili sli\-n\-ko\-vav ofi\-c\-ial{\cprime}\-ny{\u
i} ra\-bo\-chi{\u i} ka\-ta\-log} RCS {\cyr v Vash li\-chny{\u i}, gde
na\-kho\-dit\-s\-ya Va\-sha ko\-pi\-ya ra\-bo\-che\-go fa{\u i}\-la), i
po\-t\-re\-b\-uet\-s\-ya ko\-ma\-n\-da} co {\cyr v ka\-ta\-lo\-ge s
ofi\-c\-ial{\cprime}\-nym ra\-bo\-chim fa{\u i}\-lom, chto\-by
za\-me\-nit{\cprime} ego po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ie{\u i}. Pri
\`etom vse ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye me\-t\-ki fa{\u i}\-la
(sm. ni\-zhe) ob\-no\-v\-l\-ya\-yut\-s\-ya.

Mo\-zh\-no za\-dat{\cprime} no\-mer no\-vo{\u i} ve\-r\-s\-ii v
ka\-che\-s\-t\-ve ya\-v\-no\-go ar\-gu\-me\-n\-ta ko\-ma\-n\-dy}
ci{\cyr . Na\-p\-ri\-mer, sta\-r\-ye ve\-r\-s\-ii ime\-li no\-me\-ra
1.1, 1.2, 1.3, i t.d., a Vy ob{\cdprime}ya\-v\-l\-ya\-e\-te vypusk 2.
Ko\-ma\-n\-da}

ci -r2 f.c {\cyr ili} ci -r2.1 f.c

{\cyr pri\-s\-v\-oit no\-vo{\u i} ve\-r\-s\-ii no\-mer 2.1.
Na\-chi\-na\-ya s da\-n\-no{\u i} ve\-r\-s\-ii, ve\-r\-s\-ii bu\-dut
nu\-me\-ro\-vat{\cprime}\-s\-ya 2.2, 2.3, i t.d.
so\-o\-t\-vet\-s\-t\-vu\-yu\-shcha\-ya fo\-r\-ma ko\-ma\-n\-dy} co

co -r2 f.c {\cyr ili} co -r2.1 f.c

{\cyr vo\-s\-t\-re\-b\-uet so\-o\-t\-vet\-s\-t\-ve\-n\-no, li\-bo
po\-s\-le\-d\-n\-yu\-yu iz ve\-r\-si{\u i} vi\-da 2.}x {\cyr li\-bo
ve\-r\-si\-yu 2.1. Ko\-ma\-n\-da} co {\cyr so fla\-gom} -r {\cyr bez
no\-me\-ra vo\-s\-t\-re\-b\-uet po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu
gla\-v\-no{\u i} ve\-t\-vi, t.e. le\-k\-si\-ko\-g\-ra\-fi\-che\-s\-ki
na\-i\-bol{\cprime}\-shi{\u i} no\-mer ve\-r\-s\-ii,
so\-s\-to\-ya\-shchi{\u i} iz pa\-ry chi\-sel. Dlya
obo\-z\-na\-che\-ni\-ya po\-bo\-chnykh ve\-t\-ve{\u i} i ve\-r\-si{\u
i} iz nikh tre\-b\-uet\-s\-ya na\-bor bol{\cprime}\-she{\u i} dli\-ny.
Es\-li, na\-p\-ri\-mer, vy kho\-ti\-te na\-chat{\cprime}
po\-bo\-ch\-nu\-yu vetv{\cprime} va\-ri\-a\-n\-tov ot ve\-r\-s\-ii 1.3,
na\-be\-ri\-te}

ci -r1.3.1 f.c

{\cyr \`Eta ko\-ma\-n\-da na\-ch\-net vetv{\cprime} 1 ve\-r\-s\-ii 1.3
i dast pe\-r\-vo{\u i} ve\-r\-s\-ii no\-vo{\u i} ve\-t\-vi no\-mer
1.3.1.1. Dlya do\-po\-l\-ni\-tel{\cprime}\-no{\u i}
in\-fo\-r\-ma\-c\-ii o po\-bo\-chnykh ve\-t\-v\-yakh sm. v
ra\-z\-de\-le fo\-r\-mat fa{\u i}\-lov} rcsfile(5).

{\cyr AV\-TO\-MA\-TI\-CHE\-S\-KAYa IDE\-N\-TI\-FI\-KA\-CIYa

Dlya ra\-s\-po\-z\-na\-va\-ni\-ya ve\-r\-si{\u i},} RCS {\cyr mo\-zhet
vsta\-v\-l\-yat{\cprime} v is\-kho\-d\-n\-ye te\-k\-sty i v
dvo\-i\-chny{\u i} kod spe\-c\-ial{\cprime}\-n\-ye stro\-ki. Chto\-by
do\-bit{\cprime}\-s\-ya \`eto\-go, vstav{\cprime}\-te v vash tekst,
ska\-zhem, vnu\-t\-ri ko\-m\-me\-n\-ta\-ri\-ya, klyu\-che\-v\-oe
slo\-vo, na\-p\-ri\-mer}

\$Id\$

RCS {\cyr za\-me\-nit \`etot ma\-r\-ker stro\-ko{\u i} vi\-da}

\$Id: {\cyr im\-ya-fa{\u i}\-la ve\-r\-si\-ya da\-ta vre\-m\-ya
av\-tor sta\-tus \$

S ta\-ko{\u i} ot\-me\-t\-ko{\u i} na pe\-r\-vo{\u i} stra\-ni\-ce
ka\-zh\-do\-go mo\-du\-l\-ya le\-g\-ko vi\-det{\cprime} no\-mer
ve\-r\-s\-ii ra\-bo\-che\-go fa{\u i}\-la.} RCS {\cyr
av\-to\-ma\-ti\-che\-s\-ki ob\-no\-v\-l\-yaet ta\-k\-ie
ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye ma\-r\-ke\-ry. Es\-li
tre\-b\-uet\-s\-ya vklyu\-chit{\cprime} ta\-ko{\u i} ma\-r\-ker v
ob{\cdprime}ektny{\u i} kod, pri\-s\-vo{\u i}\-te ego
fi\-k\-ti\-v\-no{\u i} stro\-ko\-vo{\u i} pe\-re\-me\-n\-no{\u i}. V} C
{\cyr \`eto de\-l\-aet\-s\-ya tak:}

sta\-tic char rcsid$[$ $]$ = "\$Id\$";

{\cyr Ko\-ma\-n\-da} ident {\cyr po\-z\-vo\-l\-yaet
op\-re\-de\-lit{\cprime} ta\-k\-ie ma\-r\-ke\-ry v lyu\-bykh fa{\u
i}\-lakh, bud{\cprime} to is\-po\-l\-n\-ya\-e\-my{\u i} kod ili
sbro\-she\-n\-ny{\u i} na disk ob\-raz ope\-ra\-ti\-v\-no{\u i}
pa\-m\-ya\-ti. \`Eto po\-z\-vo\-l\-yaet op\-re\-de\-lit{\cprime}
ve\-r\-s\-ii (i dr. at\-ri\-bu\-ty) mo\-du\-le{\u i},
is\-pol{\cprime}\-zo\-va\-n\-nykh v pro\-g\-ra\-m\-me.

Dru\-go{\u i} ma\-r\-ker --} \$Log\${\cyr . On za\-me\-n\-yaet\-s\-ya
is\-to\-r\-ie{\u i} iz\-me\-ne\-ni\-ya fa{\u i}\-la. O pro\-chikh
ma\-r\-ke\-rakh sm.} co(1).

{\cyr PRO\-B\-LE\-MY

Pri si\-s\-te\-m\-nom sboe, na\-p\-ri\-mer vyzva\-v\-shem
pe\-re\-za\-pusk, mo\-gut os\-ta\-vat{\cprime}\-s\-ya
si\-g\-nal{\cprime}\-n\-ye fa{\u i}\-ly (sm.} ci(1) {\cyr
VRE\-ME\-N\-N\-YE FA{\u I}\-LY I LI\-N\-KI), ko\-to\-r\-ye
so\-de\-r\-zhat in\-fo\-r\-ma\-ci\-yu o tom, chto v da\-n\-n\-oe
vre\-m\-ya idet ra\-bo\-ta s ar\-khi\-v\-nym fa{\u i}\-lom, chto ne
dast ego iz\-me\-nit{\cprime}. Po\-lo\-zhe\-n\-ie le\-g\-ko
is\-pra\-vit{\cprime}, uda\-liv si\-g\-nal{\cprime}\-n\-ye fa{\u
i}\-ly, ime\-na ko\-to\-rykh ob\-ychno ili na\-chi\-na\-yut\-s\-ya s
za\-p\-ya\-to{\u i}, ili za\-ka\-n\-chi\-va\-yut\-s\-ya na si\-m\-vol
po\-d\-che\-r\-ki\-va\-ni\-ya.


SM. TA\-K\-ZHE}

ci(1), co(1), ident(1), rcs(1), rcsdiff(1), rcsintro(1), rcsmerge(1),
rlog(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


\chapter{CI(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

ci - {\cyr re\-gi\-s\-t\-ra\-ci\-ya fa{\u i}\-la v si\-s\-te\-me
ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

ci $[${\cyr fla\-gi$]$ im\-ya-fa{\u i}\-la ...

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} ci {\cyr za\-pi\-s\-y\-v\-aet (re\-gi\-s\-t\-ri\-r\-uet)
no\-vu\-yu ve\-r\-si\-yu fa{\u i}\-la v ar\-khiv. Es\-li put{\cprime} k
fa{\u i}\-lu so\-de\-r\-zhit ka\-ta\-log} RCS {\cyr ili
pri\-n\-ya\-ty{\u i} v si\-s\-te\-me ar\-khi\-v\-ny{\u i} su\-f\-fiks
(de\-ta\-li sm. ni\-zhe v ra\-z\-de\-le IME\-NA FA{\u I}\-LOV), to on
schi\-t\-aet\-s\-ya ar\-khi\-v\-nym fa{\u i}\-lom, vo vsekh
os\-tal{\cprime}\-nykh slu\-cha\-yakh pre\-d\-po\-la\-g\-aet\-s\-ya,
chto uka\-zan ra\-bo\-chi{\u i} fa{\u i}l, so\-de\-r\-zha\-shchi{\u i}
no\-ve{\u i}\-shu\-yu ve\-r\-si\-yu. Ko\-ma\-n\-da} ci {\cyr
po\-me\-shch\-aet so\-de\-r\-zhi\-m\-oe ra\-bo\-che\-go fa{\u i}\-la v
so\-o\-t\-vet\-s\-t\-vu\-yu\-shchi{\u i} ar\-khi\-v\-ny{\u i}
(}RCS{\cyr ) fa{\u i}l. Es\-li za\-da\-no im\-ya tol{\cprime}\-ko
od\-no\-go ra\-bo\-che\-go fa{\u i}\-la, ona sna\-cha\-la ishchet
ar\-khiv v po\-d\-ka\-ta\-lo\-ge} RCS {\cyr , za\-tem, v ka\-ta\-lo\-ge
s ra\-bo\-chim fa{\u i}\-lom, za\-tem, v te\-ku\-shchem ka\-ta\-lo\-ge;
es\-li za\-da\-no im\-ya tol{\cprime}\-ko od\-no\-go ar\-khi\-v\-no\-go
fa{\u i}\-la, ona sna\-cha\-la ishchet ra\-bo\-chi{\u i} fa{\u i}l v
te\-ku\-shchem ka\-ta\-lo\-ge.

Dlya us\-pe\-sh\-no\-go vypo\-l\-ne\-ni\-ya ko\-ma\-n\-dy} ci {\cyr ,
vyzyva\-yu\-shchi{\u i} ee pol{\cprime}\-zo\-va\-tel{\cprime}
do\-l\-zhen byt{\cprime} za\-ne\-sen v spi\-sok lic ime\-yu\-shchikh
do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u i}\-la, za is\-klyu\-che\-n\-iem
trekh slu\-ch\-aev: \`etot spi\-sok pust li\-bo
pol{\cprime}\-zo\-va\-tel{\cprime} ya\-v\-l\-yaet\-s\-ya
vla\-del{\cprime}\-cem fa{\u i}\-la ili si\-s\-te\-m\-nym
ad\-mi\-ni\-s\-t\-ra\-to\-rom. Da\-l\-ee, dlya to\-go, chto\-by bylo
mo\-zh\-no do\-ba\-vit{\cprime} no\-vu\-yu ve\-r\-si\-yu fa{\u i}\-la k
su\-shche\-s\-t\-vu\-yu\-shche{\u i} ve\-t\-vi, po\-s\-le\-d\-n\-ya\-ya
ve\-r\-si\-ya v nem do\-l\-zh\-na byt{\cprime}
za\-b\-ro\-ni\-ro\-va\-na dlya pol{\cprime}\-zo\-va\-te\-l\-ya. Es\-li
po\-s\-le\-d\-n\-ee us\-lo\-v\-ie ne vypo\-l\-ne\-no, mo\-zh\-no
lish{\cprime} na\-chat{\cprime} no\-vu\-yu po\-bo\-ch\-nu\-yu
vetv{\cprime}. Vpro\-chem, es\-li is\-pol{\cprime}\-z\-uet\-s\-ya
ne\-s\-t\-ro\-g\-oe bro\-ni\-ro\-va\-n\-ie (sm.} rcs(1){\cyr ),
da\-n\-n\-oe us\-lo\-v\-ie ne ya\-v\-l\-yaet\-s\-ya
ob\-ya\-za\-tel{\cprime}\-nym dlya vla\-del{\cprime}\-ca. I,
na\-ko\-nec, pri ne\-o\-b\-kho\-di\-mo\-s\-ti, bro\-ni\-ro\-va\-n\-ie
na chu\-zh\-oe im\-ya mo\-zh\-no ot\-me\-nit{\cprime} s
po\-moshch{\cprime}\-yu ko\-ma\-n\-dy} rcs .

{\cyr Es\-li ne za\-dan flag} -f {\cyr , ko\-ma\-n\-da} ci {\cyr
pro\-ve\-r\-yaet, de{\u i}\-stvi\-tel{\cprime}\-no li
re\-gi\-s\-t\-ri\-ru\-e\-ma\-ya ve\-r\-si\-ya ot\-li\-ch\-aet\-s\-ya ot
pre\-d\-y\-du\-shche{\u i}, i es\-li net, to re\-zul{\cprime}\-tat
bu\-det ta\-ko{\u i} zhe, bu\-d\-to ko\-ma\-n\-da byla pri\-me\-ne\-na
k pre\-d\-y\-du\-shche{\u i} ve\-r\-s\-ii, bu\-det uda\-len fa{\u i}l,
snya\-to bro\-ni\-ro\-va\-n\-ie, a no\-mer te\-ku\-shche{\u i}
ve\-r\-s\-ii ne uve\-li\-chit\-s\-ya;} ci -l {\cyr so\-kh\-ra\-nit, a}
ci -u {\cyr ot\-me\-nit bro\-ni\-ro\-va\-n\-ie, tak zhe, kak es\-li by
byli is\-po\-l\-ne\-ny ko\-ma\-n\-dy} co -l {\cyr ili} co -u; {\cyr
ra\-bo\-chi{\u i} fa{\u i}l os\-ta\-net\-s\-ya na me\-s\-te, a no\-mer
ve\-r\-s\-ii ne iz\-me\-nit\-s\-ya. V ta\-kom slu\-ch\-ae, es\-li
iz\-me\-ne\-ni{\u i} ne bylo vne\-se\-no, fla\-gi} -n {\cyr i} -s {\cyr
ot\-no\-s\-yat\-s\-ya k pre\-d\-y\-du\-shche{\u i} ve\-r\-s\-ii.

Pri vne\-se\-n\-ii iz\-me\-ne\-ni{\u i},} ci {\cyr
za\-p\-ra\-shi\-v\-aet re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu
za\-pis{\cprime} (}log me\-s\-sa\-ge{\cyr ). \`Eta za\-pis{\cprime}
do\-l\-zh\-na ot\-ra\-zhat{\cprime} sut{\cprime} vne\-se\-n\-nykh
iz\-me\-ne\-ni{\u i}; ee ko\-n\-com schi\-t\-aet\-s\-ya si\-m\-vol
ko\-n\-ca fa{\u i}\-la (}$<$Ctrl-D$>$ {\cyr v} UNIX{\cyr ) ili
stro\-ka, so\-de\-r\-zha\-shcha\-ya edi\-n\-s\-t\-ve\-n\-ny{\u i}
si\-m\-vol -- to\-ch\-ku (kak v} Mail{\cyr ). Es\-li od\-no{\u i}
ko\-ma\-n\-do{\u i} re\-gi\-s\-t\-ri\-ru\-yut\-s\-ya
ne\-s\-kol{\cprime}\-ko fa{\u i}\-lov, to pre\-d\-la\-g\-aet\-s\-ya
vo\-z\-mo\-zh\-nost{\cprime} po\-v\-to\-r\-no
is\-pol{\cprime}\-zo\-vat{\cprime} (}re\-u\-se{\cyr )
re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu za\-pis{\cprime} vne\-se\-n\-nu\-yu
v pre\-d\-y\-du\-shchi{\u i} ar\-khiv. Es\-li svo{\u i} vvod
pro\-g\-ra\-m\-ma po\-lu\-ch\-aet ne s te\-r\-mi\-na\-la (ot dru\-go{\u
i} pro\-g\-ra\-m\-my ili iz ko\-ma\-n\-d\-no\-go fa{\u i}\-la), to
za\-p\-ros po\-da\-v\-l\-yaet\-s\-ya, i dlya vsekh fa{\u i}\-lov,
re\-gi\-s\-t\-ri\-r\-ue\-mykh od\-no{\u i} ko\-ma\-n\-do{\u i},
is\-pol{\cprime}\-z\-uet\-s\-ya od\-na
re\-gi\-s\-t\-ra\-ci\-o\-n\-na\-ya za\-pis{\cprime}. Sm. flag} -m.

{\cyr Es\-li ar\-khi\-v\-ny{\u i} (}RCS{\cyr ) fa{\u i}l ne
su\-shche\-s\-t\-v\-uet,} ci {\cyr so\-z\-dast ego i, po
umo\-l\-cha\-ni\-yu za\-dast no\-mer 1.1 . Spi\-sok lic
ime\-yu\-shchikh do\-s\-tup k k fa{\u i}\-lu iz\-na\-chal{\cprime}\-no
pust, a vme\-s\-to re\-gi\-s\-t\-ra\-ci\-o\-n\-no{\u i} za\-pi\-si,
za\-p\-ra\-shi\-v\-aet\-s\-ya opi\-sa\-n\-ie fa{\u i}\-la. (Sm. flag}
-t{\cyr ).

No\-mer} rev {\cyr re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i} ve\-r\-s\-ii
mo\-zhet byt{\cprime} za\-dan s lyu\-bym iz fla\-gov} -f, -i, -I, -j,
-k, -l, -M, -q, -r {\cyr ili} -u.

{\cyr No\-mer} rev {\cyr mo\-zhet byt{\cprime}
si\-m\-vol{\cprime}\-nym, chi\-s\-lo\-vym ili sme\-sha\-n\-nym, no
vkho\-d\-ya\-shch\-ie v ne\-go si\-m\-vo\-li\-che\-s\-k\-ie ime\-na
do\-l\-zhny byt{\cprime} uzhe op\-re\-de\-le\-ny; sm. fla\-gi} -n {\cyr
i} -N {\cyr o pri\-s\-va\-i\-va\-n\-ii imen pri
re\-gi\-s\-t\-ra\-c\-ii. Es\-li} rev = \$ {\cyr , to} ci {\cyr
op\-re\-de\-l\-yaet no\-mer ve\-r\-s\-ii po
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nym ma\-r\-ke\-ram v ra\-bo\-chem fa{\u
i}\-le.

Es\-li} rev {\cyr na\-chi\-n\-aet\-s\-ya s to\-ch\-ki, to v na\-cha\-lo
po\-d\-s\-ta\-v\-l\-yaet\-s\-ya no\-mer ve\-r\-s\-ii po
umo\-l\-cha\-ni\-yu (ob\-ychno -- po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya
gla\-v\-no{\u i} ve\-t\-vi). Es\-li} rev {\cyr
za\-ka\-n\-chi\-v\-aet\-s\-ya to\-ch\-ko{\u i}, to
is\-pol{\cprime}\-z\-uet\-s\-ya po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche{\u i} po\-bo\-ch\-no{\u i}
ve\-t\-vi.

No\-mer} rev {\cyr re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i} ve\-r\-s\-ii
li\-bo do\-l\-zhen byt{\cprime} bol{\cprime}\-she, chem no\-mer
po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii v
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche{\u i} ve\-t\-vi, li\-bo on
do\-l\-zhen na\-chi\-nat{\cprime} no\-vu\-yu vetv{\cprime}.

Es\-li} rev {\cyr ya\-v\-l\-yaet\-s\-ya no\-me\-rom ve\-t\-vi, a ne
ve\-r\-s\-ii, to fa{\u i}l sta\-vit\-s\-ya v ko\-nec \`eto{\u i}
ve\-t\-vi, a no\-mer ve\-r\-s\-ii po\-lu\-ch\-aet\-s\-ya
uve\-li\-che\-n\-iem na edi\-ni\-cu no\-me\-ra ve\-r\-s\-ii
na\-kho\-d\-ya\-shche{\u i}\-sya na ve\-r\-shi\-ne \`eto{\u i}
ve\-t\-vi. Es\-li} rev {\cyr za\-d\-aet
ne\-su\-shche\-s\-t\-vu\-yu\-shchu\-yu vetv{\cprime}, to \`eta
vetv{\cprime} so\-z\-d\-aet\-s\-ya, s pe\-r\-vo{\u i} ve\-r\-s\-ie{\u
i} pod no\-me\-rom} rev.1.

{\cyr Es\-li no\-mer} rev {\cyr opu\-shchen, ko\-ma\-n\-da} ci {\cyr
op\-re\-de\-l\-yaet no\-mer no\-vo{\u i} ve\-r\-s\-ii po
bro\-ni\-ro\-va\-ni\-yu. Es\-li pol{\cprime}\-zo\-va\-tel{\cprime}
za\-b\-ro\-ni\-ro\-val po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu ve\-t\-vi,
to no\-va\-ya ve\-r\-si\-ya sta\-vit\-s\-ya v ko\-nec, a ee no\-mer
po\-lu\-ch\-aet\-s\-ya uve\-li\-che\-n\-iem pre\-d\-y\-du\-shche\-go na
edi\-ni\-cu. Es\-li pol{\cprime}\-zo\-va\-tel{\cprime}
za\-b\-ro\-ni\-ro\-val pro\-me\-zhu\-to\-ch\-nu\-yu ve\-r\-si\-yu, to
so\-z\-d\-aet\-s\-ya no\-va\-ya vetv{\cprime}, vykho\-d\-ya\-shcha\-ya
iz \`eto{\u i} ve\-r\-shi\-ny; no\-mer ve\-t\-vi po\-lu\-ch\-aet\-s\-ya
uve\-li\-che\-n\-iem na edi\-ni\-cu ma\-k\-si\-mal{\cprime}\-no\-go iz
no\-me\-rov ve\-t\-ve{\u i}, na\-chi\-na\-yu\-shchi\-kh\-s\-ya ot
\`eto{\u i} ve\-r\-s\-ii. Po umo\-l\-cha\-ni\-yu, no\-me\-ra no\-vykh
ve\-t\-ve{\u i} i ve\-r\-si{\u i} v no\-vykh ve\-t\-v\-yakh
po\-la\-ga\-yut\-s\-ya ra\-v\-n\-y\-mi 1 .

Es\-li ni} rev {\cyr ne za\-da\-no, ni ve\-r\-s\-ii ne
za\-b\-ro\-ni\-ro\-va\-ny, no pol{\cprime}\-zo\-va\-tel{\cprime}
ya\-v\-l\-yaet\-s\-ya vla\-del{\cprime}\-cem fa{\u i}\-la, i
is\-pol{\cprime}\-z\-uet\-s\-ya ne\-s\-t\-ro\-g\-oe
bro\-ni\-ro\-va\-n\-ie, to no\-va\-ya ve\-r\-si\-ya
do\-ba\-v\-l\-yaet\-s\-ya k ve\-t\-vi, op\-re\-de\-l\-ya\-e\-mo{\u i}
po umo\-l\-cha\-ni\-yu (ob\-ychno -- gla\-v\-no{\u i}; sm. flag} -b
{\cyr ko\-ma\-n\-dy} rcs(1){\cyr ).

Za\-me\-cha\-n\-ie: v gla\-v\-no{\u i} ve\-t\-vi vse ve\-r\-s\-ii
po\-lu\-che\-ny do\-ba\-v\-le\-n\-iem v ko\-nec, kak v ma\-ga\-zi\-ne
(ste\-ke), i ne mo\-gut byt{\cprime} vsta\-v\-le\-ny v se\-re\-di\-nu.

FLA\-GI}

-rrev

{\cyr Za\-re\-gi\-s\-t\-ri\-ro\-vat{\cprime} pod no\-me\-rom
ve\-r\-s\-ii} rev.

-r

{\cyr Dlya vsekh pro\-chikh ko\-mand} RCS {\cyr , flag} -r {\cyr bez
no\-me\-ra po umo\-l\-cha\-ni\-yu za\-d\-aet
na\-i\-men{\cprime}\-shi{\u i} vo\-z\-mo\-zhny{\u i} no\-mer
ve\-r\-s\-ii. Dlya ko\-ma\-n\-dy} ci {\cyr ta\-ko{\u i} \`ef\-fekt
(no\-mer na edi\-ni\-cu bol{\cprime}\-shi{\u i} po\-s\-le\-d\-ne{\u i}
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-no{\u i} ve\-r\-s\-ii)
do\-s\-ti\-g\-aet\-s\-ya ot\-sut\-s\-t\-v\-iem fla\-ga, a} -r {\cyr
is\-pol{\cprime}\-z\-uet\-s\-ya dlya to\-go, chto\-by
vo\-s\-s\-ta\-no\-vit{\cprime} po\-ve\-de\-n\-ie ko\-ma\-n\-dy po
umo\-l\-cha\-ni\-yu v ot\-no\-she\-n\-ii bro\-ni\-ro\-va\-ni\-ya i
uda\-le\-ni\-ya fa{\u i}\-la. Nu\-zh\-no \`eto dlya to\-go, chto\-by
ot\-me\-nit{\cprime} de{\u i}\-stvie fla\-gov} -l {\cyr i} -u {\cyr
za\-da\-n\-n\-oe ko\-ma\-n\-dnym fa{\u i}\-lom, pse\-v\-do\-ni\-mom ili
pe\-re\-me\-n\-n\-y\-mi sre\-dy.}

-l$[$rev$]$

{\cyr De{\u i}\-stvuet tak zhe, kak} -r {\cyr , po\-s\-le ko\-to\-ro{\u
i} byla is\-po\-l\-ne\-na ko\-ma\-n\-da} co -l {\cyr dlya to{\u i} zhe
ve\-r\-s\-ii. \`Eto oz\-na\-ch\-aet, chto no\-va\-ya ve\-r\-si\-ya
fa{\u i}\-la vo\-s\-s\-ta\-na\-v\-li\-v\-aet\-s\-ya v ra\-bo\-chi{\u i}
fa{\u i}l i sra\-zu zhe bro\-ni\-r\-uet\-s\-ya. Vse ma\-r\-ke\-ry
ob\-no\-v\-l\-ya\-yut\-s\-ya. Is\-pol{\cprime}\-z\-uet\-s\-ya v
slu\-ch\-ae, ko\-g\-da nu\-zh\-no so\-kh\-ra\-nit{\cprime}
pro\-me\-zhu\-to\-chny{\u i} re\-zul{\cprime}\-tat i
pro\-do\-l\-zhit{\cprime} ra\-bo\-tu s fa{\u i}\-lom.}

-u$[$rev$]$

{\cyr De{\u i}\-stvuet tak zhe, kak} -l {\cyr , ve\-r\-si\-ya ne
bro\-ni\-r\-uet\-s\-ya. Vse ma\-r\-ke\-ry ob\-no\-v\-l\-ya\-yut\-s\-ya.
Is\-pol{\cprime}\-z\-uet\-s\-ya v slu\-ch\-ae, ko\-g\-da ra\-bo\-ta s
fa{\u i}\-lom za\-ko\-n\-che\-na, no nu\-zh\-no
so\-kh\-ra\-nit{\cprime} do\-s\-tup dlya chte\-ni\-ya ra\-bo\-che{\u i}
ve\-r\-s\-ii.

Tri fla\-ga:} -l , -r {\cyr bez no\-me\-ra, i} -u {\cyr , vza\-i\-m\-no
is\-klyu\-cha\-yut drug dru\-ga, i ka\-zhdy{\u i}
po\-s\-le\-du\-yu\-shchi{\u i} ot\-me\-n\-yaet pre\-d\-y\-du\-shchi{\u
i} bez so\-o\-b\-shche\-ni\-ya. Pust{\cprime}, na\-p\-ri\-mer, flag} -r
{\cyr za\-dan kak pa\-ra\-metr ko\-ma\-n\-d\-no\-mu fa{\u i}\-lu ili
pse\-v\-do\-ni\-mu, ko\-to\-ry{\u i} is\-pol{\cprime}\-z\-uet} ci -u
{\cyr . To\-g\-da v re\-zul{\cprime}\-ta\-te po\-d\-s\-ta\-no\-v\-ki
po\-lu\-chit\-s\-ya} ci -u -r {\cyr chto ra\-v\-no\-sil{\cprime}\-no}
ci -r {\cyr po\-to\-mu, chto} -r {\cyr bez no\-me\-ra ot\-me\-nit} -u .

-f$[$rev$]$

{\cyr Be\-zu\-s\-lo\-v\-no re\-gi\-s\-t\-ri\-r\-uet ve\-r\-si\-yu pod
no\-vym no\-me\-rom, da\-zhe v slu\-ch\-ae, ot\-sut\-s\-t\-vi\-ya
fa\-k\-ti\-che\-s\-kikh iz\-me\-ne\-ni{\u i}.}

-k$[$rev$]$

{\cyr Pro\-s\-ma\-t\-ri\-v\-aet ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye
ma\-r\-ke\-ry v ra\-bo\-chem fa{\u i}\-le, chto\-by
op\-re\-de\-lit{\cprime} ego ve\-r\-si\-yu, da\-tu so\-z\-da\-ni\-ya,
sta\-tus i av\-to\-ra (sm.} co(1){\cyr ), pri\-pi\-s\-y\-v\-aet ikh
re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i} ve\-r\-s\-ii, vme\-s\-to to\-go,
chto\-by op\-re\-de\-l\-yat{\cprime} ikh po ar\-khi\-vu i
si\-s\-te\-m\-nym cha\-sam. Pri \`etom ge\-ne\-ri\-r\-uet\-s\-ya
re\-gi\-s\-t\-ra\-ci\-o\-n\-na\-ya za\-pis{\cprime},
ot\-me\-cha\-yu\-shcha\-ya de{\u i}\-stvi\-tel{\cprime}\-n\-oe
vre\-m\-ya i re\-gi\-s\-t\-ri\-ru\-yu\-shche\-go
pol{\cprime}\-zo\-va\-te\-l\-ya. Pri\-me\-n\-yaet\-s\-ya pri
ra\-s\-s\-y\-l\-ke do\-ku\-me\-n\-tov ili te\-k\-s\-tov pro\-g\-ramm.
Dlya so\-kh\-ra\-ne\-ni\-ya av\-to\-r\-s\-kikh da\-n\-nykh, v t.ch.
no\-me\-ra ve\-r\-s\-ii i vre\-me\-ni so\-z\-da\-ni\-ya, vo vsekh
de\-po\-zi\-ta\-ri\-yakh fa{\u i}l nu\-zh\-no
re\-gi\-s\-t\-ri\-ro\-vat{\cprime} s fla\-gom} -k {\cyr . Sle\-d\-uet
za\-me\-tit{\cprime}, chto i zna\-che\-ni\-ya klyu\-che\-vykh slov i
re\-gi\-s\-t\-ra\-ci\-o\-n\-na\-ya za\-pis{\cprime} mo\-gut
byt{\cprime} iz\-me\-ne\-ny fla\-ga\-mi} -d , -m , -s , -w {\cyr i
lyu\-bo{\u i} dru\-go{\u i}, so\-de\-r\-zha\-shche{\u i} no\-mer
ve\-r\-s\-ii v ya\-v\-nom vi\-de.}

-q$[$rev$]$

{\cyr Po\-da\-v\-l\-yaet so\-o\-b\-shche\-ni\-ya. Es\-li ne za\-dan
flag} -f {\cyr , i fa{\u i}l ne ot\-li\-ch\-aet\-s\-ya ot
po\-s\-le\-d\-ne{\u i} za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-no{\u i}
ve\-r\-s\-ii, to re\-gi\-s\-t\-ra\-c\-ii ne pro\-i\-s\-kho\-dit.
Is\-pol{\cprime}\-z\-uet\-s\-ya v ko\-ma\-n\-dnykh fa{\u i}\-lakh.}

-i$[$rev$]$

{\cyr Re\-gi\-s\-t\-ra\-ci\-ya s ini\-ci\-a\-li\-za\-c\-ie{\u i}
ar\-khi\-va. Vydaet so\-o\-b\-shche\-n\-ie ob oshi\-b\-ke, es\-li
ar\-khi\-v\-ny{\u i} fa{\u i}l uzhe su\-shche\-s\-t\-v\-uet.
Is\-pol{\cprime}\-z\-uet\-s\-ya pri ne\-so\-o\-t\-vet\-s\-t\-v\-ii
bystro\-de{\u i}\-stvi\-ya po\-d\-si\-s\-tem. Ta\-k\-zhe,
po\-z\-vo\-l\-yaet iz\-be\-zhat{\cprime} pri\-s\-va\-i\-va\-ni\-ya
od\-no\-go ime\-ni ra\-z\-nym do\-ku\-me\-n\-tam.}

-j$[$rev$]$

{\cyr Re\-gi\-s\-t\-ra\-ci\-ya bez ini\-ci\-a\-li\-za\-c\-ii
ar\-khi\-va. Vydaet so\-o\-b\-shche\-n\-ie ob oshi\-b\-ke, es\-li
ar\-khi\-v\-no\-go fa{\u i}\-la net. Sm. flag} -i .

-I$[$rev$]$

{\cyr In\-te\-ra\-k\-ti\-v\-ny{\u i} re\-zhim. Vyda\-yut\-s\-ya
so\-o\-b\-shche\-ni\-ya i za\-p\-ro\-sy, da\-zhe es\-li vvod
osu\-shche\-s\-t\-v\-l\-yaet\-s\-ya ne s kla\-vi\-a\-tu\-ry.}

-d$[$date$]$

{\cyr Za\-d\-aet da\-tu i vre\-m\-ya dlya
re\-gi\-s\-t\-ra\-ci\-o\-n\-no{\u i} ot\-me\-t\-ki v ar\-khi\-ve.
Fo\-r\-mat -- svo\-bo\-d\-ny{\u i}, kak uka\-zan v} co(1). {\cyr
Is\-pol{\cprime}\-z\-uet\-s\-ya dlya za\-da\-ni\-ya fi\-k\-ti\-v\-no{\u
i} da\-ty s fla\-gom} -k , {\cyr es\-li v ra\-bo\-chem fa{\u i}\-le ne
uka\-za\-na da\-ta. Es\-li da\-ta ne uka\-za\-na, no flag za\-dan,
is\-pol{\cprime}\-z\-uet\-s\-ya vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya fa{\u i}\-la.}

-M$[$rev$]$

{\cyr So\-kh\-ra\-n\-yaet vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya fa{\u i}\-la (kak at\-ri\-but \`eto\-go fa{\u
i}\-la). Na\-p\-ri\-mer, ko\-ma\-n\-da} ci -d -M -u f {\cyr ne
me\-n\-yaet vre\-m\-ya po\-s\-le\-d\-ne\-go iz\-me\-ne\-ni\-ya} f {\cyr
, da\-zhe es\-li ego so\-de\-r\-zha\-n\-ie iz\-me\-ni\-los{\cprime}
po\-s\-le po\-d\-s\-ta\-no\-v\-ki zna\-che\-ni{\u i} klyu\-che\-vykh
slov. Ta\-k\-oe po\-ve\-de\-n\-ie fla\-ga vvo\-dit v
za\-b\-lu\-zh\-de\-ni\-yu ko\-ma\-n\-du} ma\-ke(1) {\cyr i, po\-to\-mu
ne\-o\-b\-kho\-di\-ma os\-to\-ro\-zh\-nost{\cprime}.}

-mmsg

{\cyr Is\-pol{\cprime}\-zo\-vat{\cprime} stro\-ku} msg {\cyr v
ka\-che\-s\-t\-ve re\-gi\-s\-t\-ra\-ci\-o\-n\-no{\u i} za\-pi\-si. Po
so\-g\-la\-she\-ni\-yu, re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye za\-pi\-si,
na\-chi\-na\-yu\-shchi\-e\-s\-ya s} \# {\cyr , ya\-v\-l\-ya\-yut\-s\-ya
ko\-m\-me\-n\-ta\-ri\-ya\-mi i ig\-no\-ri\-ru\-yut\-s\-ya
pro\-g\-ra\-m\-ma\-mi ti\-pa ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}
v} emacs(1) {\cyr . Re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye za\-pi\-si,
na\-chi\-na\-yu\-shchi\-e\-s\-ya s $\lbrace$ne\-ki{\u
i}-pri\-z\-nak$\rbrace$ (i pro\-be\-lom po\-s\-le)
pre\-d\-na\-z\-na\-che\-ny dlya gru\-p\-pi\-ro\-v\-ki v is\-to\-r\-ii
iz\-me\-ne\-ni{\u i} fa{\u i}\-la i mo\-gut slu\-zhit{\cprime}
pri\-z\-na\-kom dlya gru\-p\-pi\-ro\-v\-ki v is\-to\-r\-ii
si\-s\-te\-my, da\-zhe es\-li ot\-no\-s\-yat\-s\-ya k ra\-z\-nym fa{\u
i}\-lam. Sam si\-m\-vol $\lbrace$ne\-ki{\u i}-pri\-z\-nak$\rbrace$ ne
ya\-v\-l\-yaet\-s\-ya chast{\cprime}\-yu
re\-gi\-s\-t\-ra\-ci\-o\-n\-no{\u i} za\-pi\-si. Sr.} -t .

-nname

{\cyr Pri\-s\-va\-i\-v\-aet no\-mer re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i}
ve\-r\-s\-ii si\-m\-vo\-li\-che\-s\-ko\-mu ime\-ni} na\-me {\cyr .
Es\-li \`eto im\-ya svya\-za\-no s dru\-go{\u i} ve\-r\-s\-ie{\u i}
to\-go zhe fa{\u i}\-la, vydaet so\-o\-b\-shche\-n\-ie ob oshi\-b\-ke.}

-nname

{\cyr To zhe, chto i} -n {\cyr , no vme\-s\-to so\-o\-b\-shche\-ni\-ya
ob oshi\-b\-ke ot\-me\-n\-yaet sta\-r\-oe zna\-che\-n\-ie} na\-me.

-sstate

{\cyr Pri\-d\-aet re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i} ve\-r\-s\-ii
sta\-tus} state {\cyr . Sta\-tus po umo\-l\-cha\-ni\-yu --} Exp .

-tfi\-le

{\cyr Is\-pol{\cprime}\-zo\-vat{\cprime} so\-de\-r\-zhi\-m\-oe fa{\u
i}\-la} fi\-le {\cyr v ka\-che\-s\-t\-ve opi\-sa\-ni\-ya
re\-gi\-s\-t\-ri\-ru\-e\-mo\-go fa{\u i}\-la. Og\-ra\-ni\-che\-n\-ie:
mi\-nus ne mo\-zhet byt{\cprime} pe\-r\-vym si\-m\-vo\-lom v ime\-ni}
fi\-le.

-t-string

{\cyr Is\-pol{\cprime}\-zo\-vat{\cprime} stro\-ku} string {\cyr v
ka\-che\-s\-t\-ve opi\-sa\-ni\-ya re\-gi\-s\-t\-ri\-ru\-e\-mo\-go fa{\u
i}\-la.

Flag} -t {\cyr v ob\-eikh fo\-r\-makh im\-eet smysl tol{\cprime}\-ko
pri ini\-ci\-a\-li\-za\-c\-ii ar\-khi\-va, pri re\-gi\-s\-t\-ra\-c\-ii
po\-s\-le\-du\-yu\-shchikh ve\-r\-si{\u i} ig\-no\-ri\-r\-uet\-s\-ya.
Sr.} -m .

{\cyr Es\-li pri ini\-ci\-a\-li\-za\-c\-ii ar\-khi\-va flag} -t {\cyr
ne za\-dan , to ko\-ma\-n\-da} ci {\cyr po\-t\-re\-b\-uet vve\-s\-ti so
sta\-n\-da\-r\-t\-no\-go vvo\-da opi\-sa\-n\-ie fa{\u i}\-la (chto on
iz se\-b\-ya pre\-d\-s\-ta\-v\-l\-yaet, za\-chem nu\-zhen i t.p.; \`eta
za\-pis{\cprime} bu\-det ot\-no\-sit{\cprime}\-s\-ya ko vsem
ve\-r\-si\-yam), ee ko\-n\-com schi\-t\-aet\-s\-ya si\-m\-vol ko\-n\-ca
fa{\u i}\-la ($<$}Ctrl-D$>$ {\cyr v} UNIX{\cyr ) ili stro\-ka,
so\-de\-r\-zha\-shcha\-ya edi\-n\-s\-t\-ve\-n\-ny{\u i} si\-m\-vol --
to\-ch\-ku. Es\-li pri \`etom vo\-z\-mo\-zh\-no vza\-i\-mo\-de{\u
i}\-stvie s pol{\cprime}\-zo\-va\-te\-lem, pro\-g\-ra\-m\-ma vydast
pri\-g\-la\-she\-n\-ie ko vvo\-du.

Dlya so\-v\-me\-s\-ti\-mo\-s\-ti s pre\-d\-y\-du\-shchi\-mi
ve\-r\-si\-ya\-mi,} -t {\cyr bez pa\-ra\-me\-t\-ra
ig\-no\-ri\-r\-uet\-s\-ya.}

-T

{\cyr Is\-pol{\cprime}\-z\-uet da\-tu i vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya ra\-bo\-che\-go fa{\u i}\-la dlya za\-da\-ni\-ya
vre\-me\-ni po\-s\-le\-d\-ne\-go iz\-me\-ne\-ni\-ya ar\-khi\-v\-no\-go
fa{\u i}\-la (kak at\-ri\-bu\-ta \`eto\-go fa{\u i}\-la), es\-li
pe\-r\-v\-oe pre\-d\-she\-s\-t\-vo\-va\-lo vto\-ro\-mu i pri \`etom
no\-va\-ya ve\-r\-si\-ya ot\-li\-ch\-na ot pre\-d\-y\-du\-shche{\u i}.
V pro\-ti\-v\-nom slu\-ch\-ae, vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya ar\-khi\-va so\-kh\-ra\-n\-yaet\-s\-ya.

Es\-li Vy za\-b\-ro\-ni\-ro\-va\-li ve\-r\-si\-yu v ar\-khi\-ve,
ko\-ma\-n\-da} ci {\cyr ob\-no\-v\-l\-yaet vre\-m\-ya
po\-s\-le\-d\-ne\-go iz\-me\-ne\-ni\-ya ar\-khi\-va,
po\-s\-kol{\cprime}\-ku v ne\-go za\-no\-sit\-s\-ya ot\-me\-t\-ka o
bro\-ni\-ro\-va\-n\-ii. Snya\-t\-ie bro\-ni\-ro\-va\-ni\-ya sno\-va
iz\-me\-nit ar\-khiv. Ar\-khiv mo\-zhet oka\-zat{\cprime}\-s\-ya
no\-v\-ee ra\-bo\-che\-go fa{\u i}\-la i dru\-gi\-mi spo\-so\-ba\-mi.
Vo-pe\-r\-vykh,} ci -M {\cyr mo\-zhet so\-z\-dat{\cprime}
ra\-bo\-chi{\u i} fa{\u i}l so vre\-me\-nem po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya za\-do\-l\-go do te\-ku\-shche{\u i} da\-ty;
vo-vto\-rykh, vo\-s\-s\-ta\-no\-v\-le\-n\-ie pre\-d\-y\-du\-shche{\u i}
ve\-r\-s\-ii iz ar\-khi\-va mo\-zhet ne iz\-me\-nit{\cprime}
ra\-bo\-che\-go fa{\u i}\-la. Ta\-k\-oe po\-ve\-de\-n\-ie ar\-khi\-va
vyzyvaet ne\-nu\-zh\-n\-ye ko\-m\-pi\-l\-ya\-c\-ii ili dru\-g\-ie
po\-s\-t\-ro\-e\-ni\-ya si\-s\-te\-my. Flag} -T {\cyr
po\-z\-vo\-l\-yaet iz\-be\-zhat{\cprime} \`eto\-go, vvo\-d\-ya v
za\-b\-lu\-zh\-de\-ni\-yu ko\-ma\-n\-du} ma\-ke(1) {\cyr
ot\-no\-si\-tel{\cprime}\-no za\-vi\-si\-mo\-s\-ti ra\-bo\-che\-go
fa{\u i}\-la ot ar\-khi\-v\-no\-go.

Is\-pol{\cprime}\-zu{\u i}\-te \`etu vo\-z\-mo\-zh\-nost{\cprime} s
os\-to\-ro\-zh\-nost{\cprime}\-yu: ona mo\-zhet po\-da\-vit{\cprime}
po\-s\-t\-ro\-e\-n\-ie (v cha\-s\-t\-no\-s\-ti,
ko\-m\-pi\-l\-ya\-ci\-yu), es\-li s od\-nim ar\-khi\-v\-nym fa{\u
i}\-lom svya\-za\-no ne\-s\-kol{\cprime}\-ko ra\-bo\-chikh.
Na\-p\-ri\-mer, pust{\cprime} ar\-khi\-v\-ny{\u i} fa{\u i}l byl
po\-s\-le\-d\-ni{\u i} raz iz\-me\-nen v 13:00, Va\-sha li\-ch\-na\-ya
ko\-pi\-ya byla iz\-me\-ne\-na v 14:00, ko\-pi\-ya ob\-shche\-go
pol{\cprime}\-zo\-va\-ni\-ya v ka\-ta\-lo\-ge nad} RCS {\cyr byla
iz\-vle\-che\-na v 15:00, a se{\u i}\-chas 16:00. Vy de\-la\-e\-te
si\-m\-vo\-li\-che\-s\-ki{\u i} link ob\-shche\-go ka\-ta\-lo\-ga} RCS
{\cyr s ar\-khi\-v\-nym fa{\u i}\-lom v po\-d\-ka\-ta\-log} RCS {\cyr
va\-she\-go ra\-bo\-che\-go ka\-ta\-lo\-ga i vyzyva\-e\-te
ko\-ma\-n\-du} ci -d -T . {\cyr \`Eto us\-ta\-na\-v\-li\-v\-aet
vre\-m\-ya iz\-me\-ne\-ni\-ya ar\-khi\-va kak at\-ri\-but fa{\u i}\-la
ra\-v\-nym 14:00, a ne 16:00. V re\-zul{\cprime}\-ta\-te,
pro\-g\-ra\-m\-ma} ma\-ke(1) {\cyr , es\-li ona ra\-bo\-t\-aet s
ar\-khi\-vom, bu\-det ob\-lyzhno schi\-tat{\cprime}, chto dru\-ga\-ya
ra\-bo\-cha\-ya ko\-pi\-ya no\-v\-ee, chem ar\-khiv (ob\-ychno, ona
do\-l\-zh\-na pri po\-s\-t\-ro\-e\-n\-ii si\-s\-te\-my
za\-me\-nit{\cprime} sta\-ry{\u i} ra\-bo\-chi{\u i} fa{\u i}l
po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ie{\u i}).}

-wlo\-gin

{\cyr Is\-pol{\cprime}\-zo\-vat{\cprime} dlya ot\-me\-t\-ki ob
av\-to\-re pri re\-gi\-s\-t\-ra\-c\-ii im\-ya} lo\-gin {\cyr
vme\-s\-to ime\-ni pol{\cprime}\-zo\-va\-te\-l\-ya.
Is\-pol{\cprime}\-z\-uet\-s\-ya pri re\-gi\-s\-t\-ra\-c\-ii ot
chu\-zho\-go ime\-ni ili s fla\-gom} -k {\cyr , es\-li} RCS {\cyr ne
mo\-zhet sa\-mo\-s\-to\-ya\-tel{\cprime}\-no op\-re\-de\-lit{\cprime}
av\-to\-ra.}

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr na
sta\-n\-da\-r\-tny{\u i} vyvod.}

-Vn

{\cyr Imi\-ti\-r\-uet po\-ve\-de\-n\-ie ve\-r\-s\-ii} n {\cyr
ko\-m\-p\-le\-k\-sa pro\-g\-ramm} RCS . {\cyr Sm.} co(1) .

-xsuffixes

{\cyr Za\-d\-aet su\-f\-fiks, do\-ba\-v\-l\-ya\-e\-my{\u i} k ime\-ni
ar\-khi\-v\-no\-go fa{\u i}\-la. Es\-li ar\-khi\-v\-ny{\u i}
su\-f\-fiks ne\-pust, to ar\-khi\-vom schi\-t\-aet\-s\-ya lyu\-b\-oe
po\-d\-kho\-d\-ya\-shch\-ee im\-ya fa{\u i}\-la, na ne\-go
za\-ka\-n\-chi\-va\-yu\-shche\-e\-s\-ya. Pu\-s\-to\-mu
su\-f\-fi\-k\-su so\-o\-t\-vet\-s\-t\-v\-uet put{\cprime} k ar\-khi\-vu
vi\-da} RCS/path {\cyr ili} path1/RCS/path2 {\cyr . Flag} -x {\cyr
mo\-zhet za\-da\-vat{\cprime} ne odin, a ne\-s\-kol{\cprime}\-ko
su\-f\-fi\-k\-sov, ra\-z\-de\-le\-n\-nykh ko\-so{\u i} che\-r\-to{\u
i}. Na\-p\-ri\-mer,} -x,v/ {\cyr za\-dast dva ar\-khi\-v\-nykh
su\-f\-fi\-k\-sa: ,}v {\cyr i pu\-s\-to{\u i} su\-f\-fiks. Es\-li
za\-da\-ny dva ili bo\-l\-ee su\-f\-fi\-k\-sov, ko\-ma\-n\-da} ci {\cyr
pytaet\-s\-ya ikh is\-pol{\cprime}\-zo\-vat{\cprime} dlya po\-i\-s\-ka
ar\-khi\-va po\-o\-che\-re\-d\-no (sm. IME\-NA FA{\u I}\-LOV).
Pe\-r\-vy{\u i} iz na{\u i}\-de\-n\-nykh po ta\-ko\-mu kri\-te\-ri\-yu
fa{\u i}\-lov i schi\-t\-aet\-s\-ya ar\-khi\-vom. Es\-li ar\-khiv ne
na{\u i}\-den, no mo\-zhet byt{\cprime} so\-z\-dan, on
so\-z\-d\-aet\-s\-ya is\-kho\-d\-ya iz to\-go zhe kri\-te\-ri\-ya.

Ar\-khi\-v\-ny{\u i} su\-f\-fiks, is\-pol{\cprime}\-z\-ue\-my{\u i} po
umo\-l\-cha\-ni\-yu za\-vi\-sit ot ope\-ra\-ci\-o\-n\-no{\u i}
si\-s\-te\-my i ra\-ven ,}v {\cyr , es\-li ope\-ra\-ci\-o\-n\-na\-ya
si\-s\-te\-ma, kak} UNIX{\cyr , po\-d\-de\-r\-zhi\-v\-aet
za\-p\-ya\-t\-ye v ime\-ni fa{\u i}\-la; i pu\-s\-to{\u i} su\-f\-fiks
(t.e. im\-ya ar\-khi\-va ot\-li\-ch\-aet\-s\-ya tol{\cprime}\-ko
ka\-ta\-lo\-gom) , es\-li -- net. Cha\-shche vse\-go ar\-khiv
po\-me\-shcha\-yut v po\-d\-ka\-ta\-log s ime\-nem} RCS.

-zzone

{\cyr Za\-d\-aet fo\-r\-mat da\-ty pri po\-d\-s\-ta\-no\-v\-ke
klyu\-che\-vykh slov v ma\-r\-ke\-ry i cha\-so\-vo{\u i} po\-yas dlya
fla\-ga} -ddate {\cyr . Pa\-ra\-metr} zone {\cyr do\-l\-zhen
byt{\cprime} li\-bo pust, li\-bo ya\-v\-l\-yat{\cprime}\-s\-ya
chi\-s\-le\-n\-nym zna\-che\-n\-iem ot\-klo\-ne\-ni\-ya ot
Vse\-mi\-r\-no\-go Vre\-me\-ni (}UTC{\cyr ), li\-bo
spe\-c\-ial{\cprime}\-no{\u i} stro\-ko{\u i}} LT {\cyr ,
za\-da\-yu\-shche{\u i} is\-pol{\cprime}\-zo\-va\-n\-ie
me\-s\-t\-no\-go vre\-me\-ni. Po umo\-l\-cha\-ni\-yu, i
opu\-shche\-n\-ny{\u i} pa\-ra\-metr} zone {\cyr , za\-da\-yut
is\-pol{\cprime}\-zo\-va\-n\-ie Vse\-mi\-r\-no\-go Vre\-me\-ni s
is\-pol{\cprime}\-zo\-va\-n\-iem ko\-so{\u i} che\-r\-ty v
ka\-che\-s\-t\-ve ra\-z\-de\-li\-te\-l\-ya po\-le{\u i} dlya da\-ty
(sm. pri\-mer). V os\-tal{\cprime}\-nykh slu\-cha\-yakh
is\-pol{\cprime}\-z\-uet\-s\-ya sta\-n\-dart} ISO 8601{\cyr .
Na\-p\-ri\-mer, pust{\cprime} te\-ku\-shch\-ee vre\-m\-ya 8 cha\-sov
ve\-che\-ra, 11 ya\-n\-va\-r\-ya 1990, v Ti\-kho\-o\-ke\-a\-n\-s\-kom
cha\-so\-vom po\-ya\-se SShA (chto na 8 cha\-sov po\-z\-zhe, chem v
Gri\-n\-vi\-che). To\-g\-da dlya po\-d\-s\-ta\-no\-vok bu\-det
is\-pol{\cprime}\-zo\-va\-no}

~

\begin{tabular}{ll}
{\cyr flag} & {\cyr fo\-r\-mat vre\-me\-ni}\\
-z & 1990/01/12 04:00:00 ({\cyr po umo\-l\-cha\-ni\-yu)}\\
-zLT & 1990-01-11 20:00:00-08\\
-z+05:30 & 1990-01-12 09:30:00+05:30
\end{tabular}

~

{\cyr Flag} -z {\cyr vli\-yaet tol{\cprime}\-ko na ma\-r\-ke\-ry, i ne
me\-n\-yaet fo\-r\-ma\-ta da\-ty i vre\-me\-ni v ar\-khi\-v\-nom fa{\u
i}\-le, ko\-to\-r\-ye vse\-g\-da za\-d\-aet\-s\-ya vo Vse\-mi\-r\-nom
Vre\-me\-ni.

IME\-NA FA{\u I}\-LOV.

Pa\-ra ra\-bo\-chi{\u i} fa{\u i}l -- ar\-khiv mo\-zhet byt{\cprime}
za\-da\-na tre\-m\-ya spo\-so\-ba\-mi (SM. TA\-K\-ZHE PRI\-ME\-RY).

1) Za\-da\-ny oba fa{\u i}\-la -- i ra\-bo\-chi{\u i} fa{\u i}l i
ar\-khiv, pri\-chem v lyu\-bom po\-r\-ya\-d\-ke. Si\-s\-te\-ma
ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS {\cyr
ra\-s\-po\-z\-n\-aet \`eto, es\-li ar\-khi\-v\-ny{\u i} fa{\u i}l
za\-dan v vi\-de} path1/wo\-r\-k\-fi\-leX {\cyr , a ra\-bo\-chi{\u i}
fa{\u i}l v vi\-de} path2/wo\-r\-k\-fi\-le {\cyr , gde} path1/ {\cyr i}
path2/ {\cyr -- ab\-so\-l\-yu\-t\-n\-ye ili
ot\-no\-si\-tel{\cprime}\-n\-ye pu\-ti (vo\-z\-mo\-zh\-no
ra\-z\-li\-ch\-n\-ye ili pu\-s\-t\-ye) k fa{\u i}\-lam;}
wo\-r\-k\-fi\-le {\cyr -- im\-ya fa{\u i}\-la, a} X {\cyr
pri\-n\-ya\-ty{\u i} v} RCS {\cyr ar\-khi\-v\-ny{\u i} su\-f\-fiks.
Es\-li \`etot su\-f\-fiks} X {\cyr pust,} path1/ {\cyr do\-l\-zhen
li\-bo byt{\cprime} ot\-no\-si\-tel{\cprime}\-nym i
na\-chi\-nat{\cprime}\-s\-ya s} RCS/ {\cyr ili do\-l\-zhen
vklyu\-chat{\cprime} ka\-ta\-log /}RCS/ {\cyr .

2) Za\-dan tol{\cprime}\-ko ar\-khi\-v\-ny{\u i} fa{\u i}l. To\-g\-da
si\-s\-te\-ma ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS {\cyr
schi\-t\-aet, chto ra\-bo\-chi{\u i} fa{\u i}l do\-l\-zhen
na\-kho\-dit{\cprime}\-s\-ya v te\-ku\-shchem ka\-ta\-lo\-ge, a ego
im\-ya po\-lu\-ch\-aet\-s\-ya iz ime\-ni ar\-khi\-va
ot\-bra\-s\-y\-va\-n\-iem cha\-s\-ti pu\-ti} path1/ {\cyr i
ar\-khi\-v\-no\-go su\-f\-fi\-k\-sa.

3) Za\-dan tol{\cprime}\-ko ra\-bo\-chi{\u i} fa{\u i}l. To\-g\-da
si\-s\-te\-ma ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS {\cyr
schi\-t\-aet, chto im\-ya ar\-khi\-v\-no\-go fa{\u i}\-la do\-l\-zh\-no
po\-lu\-chat{\cprime}\-s\-ya iz ime\-ni ra\-bo\-che\-go
do\-ba\-v\-le\-n\-iem ar\-khi\-v\-no\-go su\-f\-fi\-k\-sa i,
vo\-z\-mo\-zh\-no, po\-d\-ka\-ta\-lo\-ga /}RCS/ {\cyr . Si\-s\-te\-ma
ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i} ishchet ar\-khiv
po\-o\-che\-re\-d\-no, do pe\-r\-vo\-go us\-pe\-kha, pro\-bu\-ya
pri\-n\-ya\-t\-ye v} RCS {\cyr su\-f\-fi\-k\-sy i ko\-m\-bi\-na\-c\-ii}
path2/RCS/wo\-r\-k\-fi\-leX {\cyr i (es\-li ar\-khiv ne na{\u i}\-den
i} X {\cyr -- ne\-pu\-s\-to{\u i} su\-f\-fiks)}
path2/wo\-r\-k\-fi\-leX.

{\cyr Es\-li ar\-khi\-v\-ny{\u i} fa{\u i}l za\-dan v 1) ili 2) bez
uka\-za\-ni\-ya pu\-ti, to si\-s\-te\-ma ot\-s\-le\-zhi\-va\-ni\-ya
ve\-r\-si{\u i}} RCS {\cyr ishchet ego sna\-cha\-la v
po\-d\-ka\-ta\-lo\-ge ./}RCS {\cyr , a za\-tem, v te\-ku\-shchem
ka\-ta\-lo\-ge.

Ko\-ma\-n\-dy} RCS {\cyr vo\-z\-v\-ra\-shcha\-yut
so\-o\-b\-shche\-n\-ie ob oshi\-b\-ke, es\-li oshi\-b\-ku
vo\-z\-v\-ra\-shch\-aet oche\-re\-d\-na\-ya po\-p\-y\-t\-ka
otkryt{\cprime} su\-shche\-s\-t\-vu\-yu\-shchi{\u i} ar\-khi\-v\-ny{\u
i} fa{\u i}l, da\-zhe es\-li \`eto lish{\cprime} odin iz
ne\-s\-kol{\cprime}\-kikh vo\-z\-mo\-zhnykh va\-ri\-a\-n\-tov.
Po\`eto\-mu, es\-li Vy kho\-ti\-te pre\-do\-t\-v\-ra\-tit{\cprime} ikh
is\-pol{\cprime}\-zo\-va\-n\-ie v ne\-ko\-to\-rom ka\-ta\-lo\-ge} d
{\cyr , so\-z\-da{\u i}\-te obychny{\u i} fa{\u i}l} d/RCS {\cyr , chto
vyzo\-vet oshi\-b\-ku pri is\-pol{\cprime}\-zo\-va\-n\-ii} RCS {\cyr ,
po\-s\-kol{\cprime}\-ku} d/RCS {\cyr ne ya\-v\-l\-yaet\-s\-ya
ka\-ta\-lo\-gom.

PRI\-ME\-RY

Do\-pu\-s\-tim, v ka\-che\-s\-t\-ve ar\-khi\-v\-no\-go
su\-f\-fi\-k\-sa} RCS {\cyr is\-pol{\cprime}\-z\-uet ,}v {\cyr . V
te\-ku\-shchem ka\-ta\-lo\-ge na\-kho\-d\-yat\-s\-ya ra\-bo\-chi{\u i}
fa{\u i}l} io.c {\cyr i po\-d\-ka\-ta\-log} RCS {\cyr s ar\-khi\-v\-nym
fa{\u i}\-lom} io.c,v {\cyr . To\-g\-da lyu\-ba\-ya iz
pri\-ve\-de\-n\-nykh ni\-zhe ko\-mand re\-gi\-s\-t\-ri\-r\-uet fa{\u
i}l} io.c {\cyr v ar\-khi\-ve} RCS/io.c,v {\cyr v ka\-che\-s\-t\-ve
po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii i uda\-l\-yaet fa{\u i}l} io.c.

ci io.c;

ci RCS/io.c,v;

ci io.c,v;

ci io.c RCS/io.c,v;

ci io.c io.c,v;

ci RCS/io.c,v io.c;

ci io.c,v io.c;

{\cyr Es\-li zhe is\-pol{\cprime}\-z\-uet\-s\-ya pu\-s\-to{\u i}
su\-f\-fiks, v ana\-lo\-gi\-ch\-no{\u i} si\-tu\-a\-c\-ii
vo\-z\-mo\-zh\-no\-s\-te{\u i} men{\cprime}\-she:}

ci io.c;

ci RCS/io.c;

ci io.c RCS/io.c;

ci RCS/io.c io.c;

{\cyr AT\-RI\-BU\-TY FA{\u I}\-LOV

Ar\-khi\-v\-ny{\u i} fa{\u i}l, so\-z\-da\-v\-ae\-my{\u i}
ko\-ma\-n\-do{\u i}} ci {\cyr na\-s\-le\-d\-uet ot ra\-bo\-che\-go
ra\-z\-re\-she\-ni\-ya dlya pol{\cprime}\-zo\-va\-te\-le{\u i} i grupp
na chte\-n\-ie i vypo\-l\-ne\-n\-ie. Es\-li ar\-khiv uzhe
su\-shche\-s\-t\-vo\-val, to ego at\-ri\-bu\-ty
so\-kh\-ra\-n\-ya\-yut\-s\-ya. Ra\-z\-re\-she\-n\-ie zhe na
za\-pis{\cprime} v ne\-go ot\-me\-n\-yaet\-s\-ya vse\-g\-da, ko\-g\-da
fa{\u i}l ne za\-b\-ro\-ni\-ro\-van fla\-gom} -l.

{\cyr VRE\-ME\-N\-N\-YE FA{\u I}\-LY I LI\-N\-KI

Pri ra\-bo\-te pro\-g\-ra\-m\-my v ka\-ta\-lo\-ge s ra\-bo\-chim fa{\u
i}\-lom i si\-s\-te\-m\-nom ka\-ta\-lo\-ge dlya vre\-me\-n\-nykh fa{\u
i}\-lov (sm. PE\-RE\-ME\-N\-N\-YE SRE\-DY :} TMPDIR{\cyr )
so\-z\-da\-yut\-s\-ya vre\-me\-n\-n\-ye pro\-me\-zhu\-to\-ch\-n\-ye
fa{\u i}\-ly. V ka\-ta\-lo\-ge s ar\-khi\-v\-n\-y\-mi fa{\u i}\-la\-mi
so\-z\-da\-yut\-s\-ya si\-g\-nal{\cprime}\-n\-ye fa{\u i}\-ly, im\-ya
ko\-to\-rykh na\-chi\-n\-aet\-s\-ya s pe\-r\-vo\-go si\-m\-vo\-la
ar\-khi\-v\-no\-go su\-f\-fi\-k\-sa, a es\-li su\-f\-fiks pust, to --
za\-ka\-n\-chi\-v\-aet\-s\-ya si\-m\-vo\-lom
po\-d\-che\-r\-ki\-va\-ni\-ya. Sle\-do\-va\-tel{\cprime}\-no, ne stoit
vybi\-rat{\cprime} ar\-khi\-v\-ny{\u i} su\-f\-fiks
na\-chi\-na\-yu\-shchi{\u i}\-sya s bu\-k\-vy ili ci\-f\-ry ili
na\-z\-y\-vat{\cprime} ra\-bo\-chi{\u i} fa{\u i}l ime\-nem
oka\-n\-chi\-va\-yu\-shchi\-m\-s\-ya si\-m\-vo\-lom
po\-d\-che\-r\-ki\-va\-ni\-ya.

Ko\-ma\-n\-da} ci {\cyr ne me\-n\-yaet ra\-bo\-chi{\u i} ili
ar\-khi\-v\-ny{\u i} fa{\u i}l fi\-zi\-che\-s\-ki, a so\-z\-d\-aet
no\-vy{\u i} i is\-pra\-v\-l\-yaet uka\-za\-tel{\cprime} na ne\-go v
ka\-ta\-lo\-ge. Po\`eto\-mu si\-m\-vo\-li\-che\-s\-k\-ie li\-n\-ki na
fa{\u i}\-ly v si\-s\-te\-me} RCS {\cyr so\-kh\-ra\-n\-ya\-yut\-s\-ya,
a si\-s\-te\-m\-n\-ye -- net.

Pro\-g\-ra\-m\-my si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS {\cyr pro\-ve\-r\-ya\-yut pra\-vo lo\-gi\-che\-s\-ko\-go
(}ef\-fe\-c\-ti\-ve{\cyr ) pol{\cprime}\-zo\-va\-te\-l\-ya (t.e.
vla\-del{\cprime}\-ca pro\-ce\-s\-sa, vyzva\-v\-she\-go
so\-o\-t\-vet\-s\-t\-vu\-yu\-shchu\-yu pro\-g\-ra\-m\-mu) na poisk i
za\-pis{\cprime} v ar\-khi\-v\-nom ka\-ta\-lo\-ge i za\-pis{\cprime} v
ar\-khi\-v\-ny{\u i} fa{\u i}l. Ot\-no\-si\-tel{\cprime}\-no pra\-va
chi\-tat{\cprime} ar\-khi\-v\-ny{\u i} i ra\-bo\-chi{\u i} fa{\u
i}\-ly, ve\-s\-ti poisk i za\-pi\-s\-y\-vat{\cprime} v ka\-ta\-log s
ra\-bo\-chim fa{\u i}\-lom, pro\-ve\-r\-yaet\-s\-ya
fi\-zi\-che\-s\-ki{\u i} (}real{\cyr )
pol{\cprime}\-zo\-va\-tel{\cprime} (vla\-de\-lec pro\-ce\-s\-sa,
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go is\-po\-l\-n\-ya\-e\-mo{\u i}
pro\-g\-ra\-m\-me). Ne vse ope\-ra\-ci\-o\-n\-n\-ye si\-s\-te\-my
po\-z\-vo\-l\-ya\-yut pro\-g\-ra\-m\-mam svo\-bo\-d\-no
pe\-re\-k\-l\-yu\-chat{\cprime} svoi pra\-va do\-s\-tu\-pa me\-zh\-du
pri\-vi\-le\-gi\-ya\-mi lo\-gi\-che\-s\-ko\-go i fi\-zi\-che\-s\-ko\-go
pol{\cprime}\-zo\-va\-te\-l\-ya. V ta\-kom slu\-ch\-ae, dlya
do\-s\-tu\-pa is\-pol{\cprime}\-z\-uet\-s\-ya im\-ya
lo\-gi\-che\-s\-ko\-go pol{\cprime}\-zo\-va\-te\-l\-ya. Vpro\-chem,
chto\-by im\-ya fi\-zi\-che\-s\-ko\-go pol{\cprime}\-zo\-va\-te\-l\-ya
ne so\-v\-pa\-da\-lo s ime\-nem lo\-gi\-che\-s\-ko\-go, nu\-zh\-no,
chto\-by u is\-pol{\cprime}\-z\-ue\-mykh ko\-pi{\u i} pro\-g\-ramm} ci
{\cyr i} co {\cyr bylo pra\-vo na is\-pol{\cprime}\-zo\-va\-n\-ie
pri\-vi\-le\-gi{\u i} ikh vla\-del{\cprime}\-ca (at\-ri\-but fa{\u
i}\-la} s){\cyr , a ne tol{\cprime}\-ko pri\-vi\-le\-gi{\u i}
vyzyva\-yu\-shche\-go pol{\cprime}\-zo\-va\-te\-l\-ya. V
sle\-du\-yu\-shchem ra\-z\-de\-le po\-ka\-za\-no, kak \`eto
is\-pol{\cprime}\-zo\-vat{\cprime} dlya
do\-po\-l\-ni\-tel{\cprime}\-no\-go obe\-s\-pe\-che\-ni\-ya
be\-zo\-pa\-s\-no\-s\-ti in\-fo\-r\-ma\-c\-ii.

Pro\-shche ko\-n\-t\-ro\-li\-ro\-vat{\cprime} do\-s\-tup k fa{\u
i}\-lam mo\-zh\-no s po\-moshch{\cprime}\-yu us\-ta\-no\-v\-ki
at\-ri\-bu\-tov sa\-mikh fa{\u i}\-lov i ka\-ta\-lo\-gov,
po\-s\-kol{\cprime}\-ku tol{\cprime}\-ko pol{\cprime}\-zo\-va\-te\-li,
ime\-yu\-shch\-ie so\-o\-t\-vet\-s\-t\-vu\-yu\-shch\-ie pra\-va
do\-s\-tu\-pa mo\-gut iz\-me\-n\-yat{\cprime} \`eti fa{\u i}\-ly.
Es\-li ope\-ra\-ci\-o\-n\-na\-ya si\-s\-te\-ma po\-z\-vo\-l\-yaet
pol{\cprime}\-zo\-va\-te\-l\-yu pri\-na\-d\-le\-zhat{\cprime}
ne\-s\-kol{\cprime}\-kim gru\-p\-pam, to mo\-zh\-no pro\-s\-to
so\-z\-dat{\cprime} gru\-p\-pu dlya ucha\-s\-t\-ni\-kov pro\-e\-k\-ta i
ob{\cdprime}ya\-vit{\cprime} ka\-ta\-log s ar\-khi\-va\-mi otkrytym
dlya za\-pi\-si tol{\cprime}\-ko chle\-nam \`eto{\u i} gru\-p\-py.
Ta\-k\-oe re\-she\-n\-ie bol{\cprime}\-she po\-d\-kho\-dit dlya
ne\-fo\-r\-mal{\cprime}\-nykh ob{\cdprime}edi\-ne\-ni{\u i},
po\-s\-kol{\cprime}\-ku vse chle\-ny gru\-p\-py mo\-gut
pro\-i\-z\-vol{\cprime}\-no i s ra\-v\-nym pra\-vom
iz\-me\-n\-yat{\cprime} ob\-shchie fa{\u i}\-ly vplot{\cprime} do ikh
uda\-le\-ni\-ya. Dlya bo\-l\-ee ser{\cprime}\-eznykh pro\-e\-k\-tov
tre\-b\-uet\-s\-ya ra\-z\-li\-chat{\cprime} me\-zh\-du
ad\-mi\-ni\-s\-t\-ra\-to\-rom si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya
ve\-r\-si{\u i}} RCS {\cyr , ko\-to\-ry{\u i} mo\-zhet
iz\-me\-n\-yat{\cprime} fa{\u i}\-ly po svoe{\u i} ini\-ci\-a\-ti\-ve,
i rya\-do\-v\-y\-mi ucha\-s\-t\-ni\-ka\-mi, ko\-to\-r\-ye mo\-gut
re\-gi\-s\-t\-ri\-ro\-vat{\cprime} no\-v\-ye ve\-r\-s\-ii, no
ni\-ka\-kim dru\-gim spo\-so\-bom ne mo\-gut iz\-me\-nit{\cprime}
ar\-khi\-v\-n\-ye fa{\u i}\-ly.

DO\-PO\-L\-NI\-TEL{\cprime}\-N\-YE ME\-RY BE\-ZO\-PA\-S\-NO\-S\-TI

Dlya pre\-do\-t\-v\-ra\-shche\-ni\-ya slu\-cha{\u i}\-no\-go ili
zlo\-na\-me\-re\-n\-no\-go uda\-le\-ni\-ya ve\-r\-si{\u i} i
real{\cprime}\-no{\u i} vo\-z\-mo\-zh\-no\-s\-ti
vo\-z\-lo\-zhit{\cprime} ot\-vet\-s\-t\-ve\-n\-nost{\cprime} za nikh na
ad\-mi\-ni\-s\-t\-ra\-to\-ra si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya
ve\-r\-si{\u i}} RCS , {\cyr mo\-gut byt{\cprime} pri\-n\-ya\-ty
sle\-du\-yu\-shch\-ie me\-ry.

$\star$ Pro\-ver{\cprime}\-te, po\-d\-de\-r\-zhi\-v\-aet li Va\-sha
ope\-ra\-ci\-o\-n\-na\-ya si\-s\-te\-ma si\-s\-te\-m\-ny{\u i} vyzov}
se\-t\-uid {\cyr v po\-l\-nom ob{\cdprime}eme.
Pro\-ko\-n\-sul{\cprime}\-ti\-ru{\u i}\-tes{\cprime} u
spe\-ci\-a\-li\-s\-ta ili pro\`ek\-spe\-ri\-me\-n\-ti\-ru{\u i}\-te s}
RCS {\cyr . Id\-eal{\cprime}\-no, es\-li si\-s\-te\-m\-ny{\u i} vyzov}
se\-te\-uid {\cyr Va\-she{\u i} ope\-ra\-ci\-o\-n\-no{\u i}
si\-s\-te\-my so\-o\-t\-vet\-s\-t\-v\-uet sta\-n\-da\-r\-tu} Po\-six
1003.1a Draft 5{\cyr , po\-to\-mu, chto \`eto oz\-na\-ch\-aet, chto}
RCS {\cyr smo\-zhet le\-g\-ko pe\-re\-k\-l\-yu\-chat{\cprime} pra\-va
do\-s\-tu\-pa lo\-gi\-che\-s\-ko\-go i fi\-zi\-che\-s\-ko\-go
pol{\cprime}\-zo\-va\-te\-le{\u i}, da\-zhe es\-li fi\-zi\-che\-s\-kim
pol{\cprime}\-zo\-va\-te\-lem ya\-v\-l\-yaet\-s\-ya} root {\cyr .
Pri\-e\-m\-le\-mo, es\-li ope\-ra\-ci\-o\-n\-na\-ya si\-s\-te\-ma
po\-d\-de\-r\-zhi\-v\-aet in\-fo\-r\-ma\-ci\-yu o byvshem
vla\-del{\cprime}\-ce (} sa\-ved se\-t\-uid {\cyr ) (svo{\u i}\-stvo}
$\lbrace$\_PO\-SIX\_SA\-VED\_IDS$\rbrace$ {\cyr sta\-n\-da\-r\-ta}
Po\-six 1003.1-1990{\cyr ); to\-g\-da pro\-b\-le\-my
vo\-z\-ni\-ka\-yut, tol{\cprime}\-ko es\-li fi\-zi\-che\-s\-ki{\u i}
pol{\cprime}\-zo\-va\-tel{\cprime} --} root {\cyr . Sle\-d\-uet
za\-me\-tit{\cprime}, chto pri oshi\-b\-ke, vyzva\-n\-no{\u i}
si\-s\-te\-m\-nym vyzo\-vom} se\-t\-uid {\cyr , ko\-ma\-n\-dy} RCS
{\cyr ava\-ri{\u i}\-no za\-ve\-r\-sha\-yut ra\-bo\-tu.

$\star$ Na\-z\-nach{\cprime}\-te pol{\cprime}\-zo\-va\-te\-l\-ya} A
{\cyr na do\-l\-zh\-nost{\cprime} ad\-mi\-ni\-s\-t\-ra\-to\-ra
si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}.
Tol{\cprime}\-ko} A {\cyr do\-l\-zhen imet{\cprime} pra\-vo
vypo\-l\-n\-yat{\cprime} ko\-ma\-n\-du} rcs {\cyr dlya ob\-shchikh
ar\-khi\-v\-nykh fa{\u i}\-lov.} A {\cyr ne do\-l\-zhen byt{\cprime}
pri\-vi\-le\-gi\-ro\-va\-n\-nym pol{\cprime}\-zo\-va\-te\-lem (ta\-kim,
kak} root {\cyr ili} uucp{\cyr ) . Gru\-p\-py
pol{\cprime}\-zo\-va\-te\-le{\u i} is\-pytyva\-yu\-shchikh
ne\-do\-ve\-r\-ie drug k dru\-gu do\-l\-zhny na\-z\-na\-chat{\cprime}
ra\-z\-nykh ad\-mi\-ni\-s\-t\-ra\-to\-rov.

$\star$ Pust{\cprime} put{\cprime} ka\-ta\-log} B {\cyr
pre\-d\-na\-z\-na\-chen dlya is\-po\-l\-n\-ya\-e\-mykh fa{\u i}\-lov
si\-s\-te\-my} RCS {\cyr dlya da\-n\-no{\u i} gru\-p\-py.

$\star$ Sde\-la{\u i}\-te tak, chto\-by vla\-del{\cprime}\-cem ko\-mand
v ka\-ta\-lo\-ge} B {\cyr byl} A {\cyr i za\-da{\u i}\-te at\-ri\-but,
pe\-re\-da\-yu\-shchi{\u i} pro\-g\-ra\-m\-mam pra\-va do\-s\-tu\-pa,
pri\-na\-d\-le\-zha\-shch\-ie} A {\cyr . Na\-p\-ri\-mer,}

mkdir B

cp D/c$[$io$]$ B

chmod go-w,u+s B/c$[$io$]$

$\star$ {\cyr Sde\-la{\u i}\-te tak, chto\-by upo\-m\-ya\-nu\-t\-ye
vyshe ko\-p\-ii ko\-mand v pu\-ti po\-i\-s\-ka
is\-po\-l\-n\-ya\-e\-mykh fa{\u i}\-lov vstre\-cha\-lis{\cprime}
ran{\cprime}\-she, chem ikh sta\-n\-da\-r\-t\-n\-ye ko\-p\-ii.
Na\-p\-ri\-mer, v ko\-n\-ce so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go
ini\-ci\-a\-li\-za\-ci\-o\-n\-no\-go fa{\u i}\-le dlya
ko\-ma\-n\-d\-no{\u i} obo\-lo\-ch\-ki po\-s\-tav{\cprime}\-te}

PATH=B:\$PATH;

ex\-port PATH \# {\cyr obychny{\u i} ko\-ma\-n\-dny{\u i}
in\-te\-r\-p\-re\-ta\-tor}

set path=(B \$path) \# {\cyr ko\-ma\-n\-dny{\u i}
in\-te\-r\-p\-re\-ta\-tor ti\-pa} csh

$\star$ {\cyr So\-z\-da{\u i}\-te ka\-ta\-log(i)} R {\cyr dlya
ra\-bo\-chikh i} R/RCS {\cyr dlya ar\-khi\-v\-nykh fa{\u i}\-lov s
pra\-vom na za\-pis{\cprime} v ka\-ta\-lo\-gi tol{\cprime}\-ko dlya} A
.

mkdir R

mkdir R/RCS

chmod go-w R R/RCS

$\star$ {\cyr Es\-li nu\-zh\-no za\-k\-ryt{\cprime} ar\-khi\-vy ot
pro\-s\-mo\-t\-ra po\-s\-to\-ro\-n\-ni\-mi, ob{\cdprime}edi\-ni\-te
pol{\cprime}\-zo\-va\-te\-le{\u i} vme\-s\-te s} A {\cyr v gru\-p\-pu}
G {\cyr , i pust{\cprime}} A {\cyr za\-k\-r\-oet ka\-ta\-lo\-gi dlya
pro\-s\-mo\-t\-ra i chte\-ni\-ya.}

chgrp G R

chmod g-w,o-rwx R

$\star$ {\cyr Pust{\cprime}} A {\cyr sko\-pi\-r\-uet vse sta\-r\-ye
fa{\u i}\-ly, po\-d\-le\-zha\-shch\-ie ko\-n\-t\-ro\-l\-yu v \`eti
ka\-ta\-lo\-gi, chto za\-pi\-shet ego ikh vla\-del{\cprime}\-cem.

$\star$ Spi\-sok lic ime\-yu\-shchikh do\-s\-tup k fa{\u i}\-lu
khra\-nit\-s\-ya ne\-po\-s\-re\-d\-s\-t\-ve\-n\-no v ar\-khi\-v\-nom
fa{\u i}\-le i og\-ra\-ni\-chi\-v\-aet krug lic, ime\-yu\-shchikh
pra\-vo iz\-me\-n\-yat{\cprime} ar\-khiv sre\-d\-s\-t\-va\-mi
si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS ({\cyr
po\-mi\-mo} RCS {\cyr iz\-me\-n\-yat{\cprime} ar\-khiv mo\-gut
tol{\cprime}\-ko} A {\cyr i} root){\cyr . Po umo\-l\-cha\-ni\-yu on
pust, a \`eto zna\-chit, chto re\-gi\-s\-t\-ri\-ro\-vat{\cprime}
no\-v\-ye ve\-r\-s\-ii mo\-zhet vsya\-ki{\u i}, kto mo\-zhet
chi\-tat{\cprime} ar\-khi\-v\-ny{\u i} fa{\u i}l (ra\-bo\-chi{\u i}
fa{\u i}l mo\-zhet na\-kho\-dit{\cprime}\-s\-ya i ne v} R ){\cyr .
Es\-li Vy kho\-ti\-te og\-ra\-ni\-chit{\cprime} \`etot krug,
pust{\cprime}} A {\cyr vyzo\-vet ko\-ma\-n\-du} rcs {\cyr so fla\-gom}
-a {\cyr dlya so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go fa{\u i}\-la. Sm.}
rcs(1){\cyr . V cha\-s\-t\-no\-s\-ti,}

rcs -e -aA

{\cyr Os\-ta\-v\-l\-yaet \`eto pra\-vo tol{\cprime}\-ko za} A ({\cyr no
eshche ne bro\-ni\-r\-uet sam fa{\u i}l).

$\star$ Pust{\cprime}} A {\cyr pro\-i\-ni\-ci\-a\-li\-zi\-r\-uet vse
ar\-khi\-v\-n\-ye fa{\u i}\-ly ko\-ma\-n\-do{\u i}} rcs {\cyr so
fla\-gom} -i {\cyr do re\-gi\-s\-t\-ra\-c\-ii pe\-r\-vo{\u i}
ve\-r\-s\-ii dru\-gi\-mi pre\-d\-s\-ta\-vi\-te\-l\-ya\-mi gru\-p\-py,
do\-ba\-viv flag} -a {\cyr , es\-li nu\-zh\-no
og\-ra\-ni\-chit{\cprime} do\-s\-tup k ar\-khi\-vu.

$\star$ Za\-da{\u i}\-te vo\-z\-mo\-zh\-nost{\cprime}
is\-pol{\cprime}\-zo\-va\-ni\-ya prav do\-s\-tu\-pa
vla\-del{\cprime}\-ca (us\-ta\-no\-v\-ko{\u i} at\-ri\-bu\-ta} s {\cyr
) tol{\cprime}\-ko dlya trekh ko\-mand:} ci, co {\cyr i} rcsclean;
{\cyr ne da\-va{\u i}\-te \`eto\-go pra\-va ko\-ma\-n\-de} rcs {\cyr i
os\-tal{\cprime}\-nym pro\-g\-ra\-m\-mam} RCS.

$\star$ {\cyr Ne pri\-s\-va\-i\-va{\u i}\-te at\-ri\-but} s {\cyr
dru\-gim pro\-g\-ra\-m\-mam. Si\-s\-te\-m\-ny{\u i} vyzov} se\-t\-uid
{\cyr go\-ra\-z\-do slo\-zh\-n\-ee, chem ka\-zhet\-s\-ya, a bu\-du\-chi
pri\-s\-v\-oen ko\-ma\-n\-dam, do\-pu\-s\-ka\-yu\-shchim vo vre\-m\-ya
ra\-bo\-ty vypo\-l\-ne\-n\-ie
pol{\cprime}\-zo\-va\-tel{\cprime}\-s\-kikh pro\-g\-ramm,
pre\-d\-s\-ta\-v\-l\-yaet so\-bo{\u i} la\-ze{\u i}\-ku v si\-s\-te\-me
be\-zo\-pa\-s\-no\-s\-ti.

PE\-RE\-ME\-N\-N\-YE SRE\-DY}

LO\-G\-NA\-ME

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya. V} UNIX {\cyr za\-da\-no
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}}

set LO\-G\-NA\-ME={\cyr im\-ya-pol{\cprime}\-zo\-va\-te\-l\-ya}

TZ

{\cyr Cha\-so\-vo{\u i} po\-yas. V} UNIX {\cyr za\-dan
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}} set.

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Ne za\-bud{\cprime}\-te, chto ne\-o\-b\-kho\-di\-my
me\-ry dlya to\-go, chto\-by pro\-be\-ly me\-zh\-du fla\-ga\-mi ne byli
ob\-ra\-bo\-ta\-ny ko\-ma\-n\-dnym in\-te\-r\-p\-re\-ta\-to\-rom
pre\-zh\-de\-v\-re\-me\-n\-no, za\-shchi\-shcha{\u i}\-te ikh,
na\-p\-ri\-mer, ob\-ra\-t\-no{\u i} ko\-so{\u i} che\-r\-to{\u i}.

Po\-le\-z\-n\-y\-mi v} RCSI\-NIT {\cyr fla\-ga\-mi mo\-gut
byt{\cprime}} -q, -V, -x {\cyr i} -z.

TMPDIR

{\cyr Me\-s\-to dlya vre\-me\-n\-nykh fa{\u i}\-lov. Es\-li ne
za\-da\-na, po\-o\-che\-re\-d\-no pro\-ve\-r\-ya\-yut\-s\-ya
pe\-re\-me\-n\-n\-ye} TMP {\cyr i} TEMP {\cyr i
is\-pol{\cprime}\-z\-uet\-s\-ya pe\-r\-va\-ya na{\u i}\-de\-n\-na\-ya,
a i es\-li oni ne za\-da\-ny, to me\-s\-to dlya vre\-me\-n\-nykh fa{\u
i}\-lov po umo\-l\-cha\-ni\-yu za\-vi\-sit ot ope\-ra\-ci\-o\-n\-no{\u
i} si\-s\-te\-my, no ob\-ychno, \`eto /}tmp .

{\cyr SO\-O\-B\-SHCHE\-NI\-Ya

Dlya ka\-zh\-do{\u i} re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i} ve\-r\-s\-ii
ka\-zh\-do\-go fa{\u i}\-la ko\-ma\-n\-da} ci {\cyr pe\-cha\-t\-aet
im\-ya ar\-khi\-v\-no\-go fa{\u i}\-la, im\-ya ra\-bo\-che\-go fa{\u
i}\-la i no\-me\-ra re\-gi\-s\-t\-ri\-ru\-e\-mo{\u i} i
pre\-d\-y\-du\-shche{\u i} ve\-r\-si{\u i}. Vo\-z\-v\-ra\-shch\-aet
ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0 to\-g\-da i
tol{\cprime}\-ko to\-g\-da, ko\-g\-da vse ope\-ra\-c\-ii
za\-ve\-r\-shi\-lis{\cprime} us\-pe\-sh\-no.

SM. TA\-K\-ZHE}

setuid(2), emacs(1), make(1),

rcsintro(1), rcs(1), co(1), rcsfile(5),

ident(1), rcsclean(1), rcsdiff(1), rcsmerge(1), rlog(1),


Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


\chapter{CO(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

co - {\cyr vo\-s\-t\-re\-bo\-va\-n\-ie iz} RCS {\cyr ar\-khi\-va
op\-re\-de\-le\-n\-no{\u i} ve\-r\-s\-ii fa{\u i}\-la

FO\-R\-MAT KO\-MA\-N\-DY}

co $[${\cyr fla\-gi$]$ im\-ya-fa{\u i}\-la ...

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} co {\cyr po\-lu\-ch\-aet iz ar\-khi\-v\-no\-go fa{\u
i}\-la ko\-pi\-yu ne\-ko\-to\-ro{\u i} ve\-r\-s\-ii fa{\u i}\-la i
po\-me\-shch\-aet ee v ra\-bo\-chi{\u i} fa{\u i}l.

Po\-l\-n\-oe im\-ya fa{\u i}\-la, so\-de\-r\-zha\-shch\-ee
ar\-khi\-v\-ny{\u i} su\-f\-fiks, so\-o\-t\-vet\-s\-t\-v\-uet
ar\-khi\-v\-no\-mu fa{\u i}\-lu, vse pro\-ch\-ie schi\-ta\-yut\-s\-ya
ra\-bo\-chi\-mi fa{\u i}\-la\-mi. O so\-o\-t\-vet\-s\-t\-v\-ii imen
fa{\u i}\-lov, sm.} ci(1) .

{\cyr Ve\-r\-s\-ii ra\-bo\-che\-go fa{\u i}\-la mo\-gut byt{\cprime}
vo\-s\-t\-re\-bo\-va\-ny iz ar\-khi\-va s bro\-ni\-ro\-va\-n\-iem ili
bez ne\-go. Bro\-ni\-ro\-va\-n\-ie pre\-do\-t\-v\-ra\-shch\-aet
vza\-i\-m\-n\-ye na\-k\-la\-d\-ki pri vne\-se\-n\-ii iz\-me\-ne\-ni{\u
i}. Vo\-s\-t\-re\-bo\-va\-n\-ie fa{\u i}\-la dlya chte\-ni\-ya ili ne
iz\-me\-n\-ya\-yu\-shche{\u i} ego ob\-ra\-bo\-t\-ki, ne tre\-b\-uet
bro\-ni\-ro\-va\-ni\-ya. Ve\-r\-si\-ya vo\-s\-t\-re\-bo\-va\-n\-na\-ya
dlya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i} i po\-s\-le\-du\-yu\-shche{\u
i} re\-gi\-s\-t\-ra\-c\-ii, do\-l\-zh\-na byt{\cprime}
za\-b\-ro\-ni\-ro\-va\-na ne\-ko\-to\-rym
pol{\cprime}\-zo\-va\-te\-lem, chto\-by pre\-do\-t\-v\-ra\-tit{\cprime}
iz\-me\-ne\-n\-ie fa{\u i}\-la dru\-gi\-mi vo vre\-m\-ya ego
ra\-bo\-ty. Po\-p\-y\-t\-ka bro\-ni\-ro\-va\-ni\-ya
za\-ve\-r\-sh\-aet\-s\-ya oshi\-b\-ko{\u i} pro\-g\-ra\-m\-my, es\-li
da\-n\-nu\-yu ve\-r\-si\-yu uzhe za\-b\-ro\-ni\-ro\-val dru\-go{\u i}
pol{\cprime}\-zo\-va\-tel{\cprime}. (Bro\-ni\-ro\-va\-n\-ie mo\-zhet
byt{\cprime} ot\-me\-ne\-no ko\-ma\-n\-do{\u i}} rcs(1) ){\cyr . Dlya
bro\-ni\-ro\-va\-ni\-ya ne\-o\-b\-kho\-di\-mo ta\-k\-zhe, chto\-by
pol{\cprime}\-zo\-va\-tel{\cprime} byl vne\-sen v spi\-sok lic
ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u i}\-la, za
is\-klyu\-che\-n\-iem trekh slu\-ch\-aev: \`etot spi\-sok pust li\-bo
pol{\cprime}\-zo\-va\-tel{\cprime} ya\-v\-l\-yaet\-s\-ya
vla\-del{\cprime}\-cem fa{\u i}\-la ili si\-s\-te\-m\-nym
ad\-mi\-ni\-s\-t\-ra\-to\-rom. Vo\-s\-t\-re\-bo\-va\-n\-ie bez
bro\-ni\-ro\-va\-ni\-ya mo\-zhet byt{\cprime}
osu\-shche\-s\-t\-v\-le\-no lyu\-bym pol{\cprime}\-zo\-va\-te\-lem,
ime\-yu\-shchim pra\-vo chte\-ni\-ya ar\-khi\-v\-no\-go fa{\u i}\-la i
ne za\-vi\-sit ot na\-li\-chi\-ya bro\-ni\-ro\-va\-ni\-ya.

Vo\-s\-t\-re\-bu\-e\-ma\-ya ve\-r\-si\-ya mo\-zhet byt{\cprime}
za\-da\-na s po\-moshch{\cprime}\-yu fla\-gov po no\-me\-ru i
ve\-t\-vi, vre\-me\-ni re\-gi\-s\-t\-ra\-c\-ii, av\-to\-ru i
sta\-tu\-su. Es\-li (ne)pri\-me\-ne\-n\-n\-ye fla\-gi
op\-re\-de\-l\-ya\-yut ne\-s\-kol{\cprime}\-ko ve\-r\-si{\u i}, to
iz\-vle\-k\-aet\-s\-ya po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya
gla\-v\-no{\u i} ve\-t\-vi (ili ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu, sm. flag} -b
{\cyr ko\-ma\-n\-dy} rcs(1) ). {\cyr No\-mer ve\-r\-s\-ii i/ili
ve\-t\-vi mo\-zhet bat{\cprime} is\-pol{\cprime}\-zo\-van s lyu\-bym iz
fla\-gov} -f, -I, -l, -M, -p, -q, -r {\cyr ili} -u.

{\cyr Fla\-gi} -d ({\cyr da\-ta),} -s ({\cyr sta\-tus), i} -w ({\cyr
av\-tor) vybe\-rut ve\-r\-si\-yu iz ve\-t\-vi, za\-da\-n\-no{\u i}
ve\-r\-si\-ya\-mi} -f, ..., -u; {\cyr a es\-li oni ne za\-da\-ny, to iz
ve\-t\-vi, is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu.

Es\-li ko\-ma\-n\-du} co {\cyr pri\-me\-nit{\cprime} k
ar\-khi\-v\-no\-mu fa{\u i}\-lu, ne so\-de\-r\-zha\-shche\-mu
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-nykh ve\-r\-si{\u i}, to
so\-z\-dast\-s\-ya ra\-bo\-chi{\u i} fa{\u i}l nu\-le\-vo{\u i}
dli\-ny. Po\-d\-s\-ta\-no\-v\-ka zna\-che\-ni{\u i} klyu\-che\-vykh
si\-m\-vo\-lov v ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye ma\-r\-ke\-ry
osu\-shche\-s\-t\-v\-l\-yaet\-s\-ya vse\-g\-da. (sm. ni\-zhe).

FLA\-GI}

-r$[$rev$]$

{\cyr Vo\-s\-t\-re\-b\-uet po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu iz
tekh, che{\u i} no\-mer men{\cprime}\-she ili ra\-ven} rev {\cyr .
Es\-li} rev {\cyr za\-d\-aet no\-mer ve\-t\-vi, to
po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu na \`eto{\u i} ve\-t\-vi iz tekh,
che{\u i} no\-mer men{\cprime}\-she ili ra\-ven} rev {\cyr . Es\-li}
rev {\cyr opu\-shchen, to iz\-vle\-k\-aet\-s\-ya
po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu (sm.
op\-ci\-yu} -b {\cyr ko\-ma\-n\-dy} rcs(1) ){\cyr . Es\-li v
ka\-che\-s\-t\-ve} rev {\cyr is\-pol{\cprime}\-zo\-van si\-m\-vol \$,
ko\-ma\-n\-da} co {\cyr op\-re\-de\-lit ve\-r\-si\-yu,
po\-d\-le\-zha\-shchu\-yu vo\-z\-v\-ra\-tu po klyu\-che\-vym slo\-vam,
so\-de\-r\-zha\-shchi\-m\-s\-ya v ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh
ma\-r\-ke\-rakh ar\-khi\-va. Ina\-che ve\-r\-si\-ya mo\-zhet
byt{\cprime} op\-re\-de\-le\-na
po\-s\-le\-do\-va\-tel{\cprime}\-nost{\cprime}\-yu iz od\-no\-go ili
bo\-l\-ee chi\-s\-lo\-vykh ili si\-m\-vol{\cprime}\-nykh po\-le{\u i},
ra\-z\-de\-le\-n\-nykh to\-ch\-ka\-mi. Es\-li \`eta
po\-s\-le\-do\-va\-tel{\cprime}\-nost{\cprime} na\-chi\-n\-aet\-s\-ya s
to\-ch\-ki, to ona do\-ba\-v\-l\-yaet\-s\-ya k ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu (ob\-ychno,
gla\-v\-no{\u i}). Es\-li \`eta
po\-s\-le\-do\-va\-tel{\cprime}\-nost{\cprime} za\-d\-aet vetv{\cprime}
i za\-ka\-n\-chi\-v\-aet\-s\-ya to\-ch\-ko{\u i}, to k ne{\u i}
do\-ba\-v\-l\-yaet\-s\-ya no\-mer po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii
na \`eto{\u i} ve\-t\-vi. Chi\-s\-le\-n\-ny{\u i} \`ek\-vi\-va\-lent
si\-m\-vol{\cprime}\-no\-go po\-l\-ya za\-d\-aet\-s\-ya fla\-gom} -n
{\cyr ko\-mand} ci(1) {\cyr i} rcs(1) .

-l$[$rev$]$

{\cyr De\-l\-aet to zhe, chto i flag} -r{\cyr , no
do\-po\-l\-ni\-tel{\cprime}\-no bro\-ni\-r\-uet dlya
pol{\cprime}\-zo\-va\-te\-l\-ya vo\-s\-t\-re\-bo\-va\-n\-nu\-yu
ve\-r\-si\-yu.}

-u$[$rev$]$

{\cyr De\-l\-aet to zhe, chto i flag} -r{\cyr , no ot\-me\-n\-yaet
bro\-ni\-ro\-va\-n\-ie dlya pol{\cprime}\-zo\-va\-te\-l\-ya na
vo\-s\-t\-re\-bo\-va\-n\-nu\-yu ve\-r\-si\-yu, es\-li ona byla
za\-b\-ro\-ni\-ro\-va\-na. Es\-li no\-mer} rev {\cyr opu\-shchen,
bro\-ni\-ro\-va\-n\-ie sni\-m\-aet\-s\-ya s po\-s\-le\-d\-ne{\u i} iz
ve\-r\-si{\u i}, za\-b\-ro\-ni\-ro\-va\-n\-nykh na ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu.}

-f$[$rev$]$

{\cyr Be\-zu\-s\-lo\-v\-no vo\-s\-t\-re\-b\-uet ve\-r\-si\-yu,
za\-ti\-ra\-ya, es\-li nu\-zh\-no ra\-bo\-chi{\u i} fa{\u i}l.
Ob\-ychno is\-pol{\cprime}\-z\-uet\-s\-ya v pa\-re s fla\-gom} -q.
{\cyr Sm. ni\-zhe AT\-RI\-BU\-TY FA{\u I}\-LOV.}

-kkv

{\cyr Po\-d\-s\-ta\-v\-l\-yaet zna\-che\-ni\-ya klyu\-che\-vykh
si\-m\-vo\-lov (na\-p\-ri\-mer,} \$Revision: 5.13 \${\cyr ) v
ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye ma\-r\-ke\-ry (zdes{\cprime}:}
\$Revision\$ ){\cyr . Flag vklyu\-chen po umo\-l\-cha\-ni\-yu. Im\-ya
pol{\cprime}\-zo\-va\-te\-l\-ya, za\-b\-ro\-ni\-ro\-va\-v\-she\-go
fa{\u i}l, po\-d\-s\-ta\-v\-l\-yaet\-s\-ya v zna\-che\-ni\-ya
klyu\-che\-vykh si\-m\-vo\-lov} He\-a\-der, Id{\cyr , i} Lo\-c\-ker
{\cyr tol{\cprime}\-ko to\-g\-da, ko\-g\-da fa{\u i}l de{\u
i}\-stvi\-tel{\cprime}\-no za\-b\-ro\-ni\-ro\-van, na\-p\-ri\-mer,
ko\-ma\-n\-da\-mi} ci -l {\cyr ili} co -l .

-kkvl

{\cyr De\-l\-aet to zhe, chto i flag} -kkv{\cyr , no im\-ya
pol{\cprime}\-zo\-va\-te\-l\-ya, za\-k\-r\-y\-v\-she\-go fa{\u i}l dlya
iz\-me\-ne\-ni\-ya, po\-d\-s\-ta\-v\-l\-yaet\-s\-ya v zna\-che\-ni\-ya
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rov tol{\cprime}\-ko
to\-g\-da, ko\-g\-da za\-b\-ro\-ni\-ro\-va\-na da\-n\-na\-ya
ve\-r\-si\-ya.}

-kk

{\cyr Po\-d\-s\-ta\-v\-l\-yaet v ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye
ma\-r\-ke\-ry sa\-mi klyu\-che\-v\-ye si\-m\-vo\-ly, no ne ikh
zna\-che\-ni\-ya. Sm. ra\-z\-del AV\-TO\-MA\-TI\-CHE\-S\-KA\-Ya
IDE\-N\-TI\-FI\-KA\-CI\-Ya. Na\-p\-ri\-mer, klyu\-che\-v\-oe slo\-vo}
Re\-vi\-s\-ion {\cyr po\-ro\-zh\-d\-aet
ide\-n\-ti\-fi\-ka\-ci\-o\-n\-nu\-yu stro\-ku} \$Revision\$ {\cyr
vme\-s\-to sta\-n\-da\-r\-t\-no\-go} \$Revision: 5.13 \$.

{\cyr Is\-pol{\cprime}\-z\-uet\-s\-ya chto\-by po\-da\-vit{\cprime}
so\-o\-b\-shche\-ni\-ya o ra\-z\-li\-cha\-yu\-shchi\-kh\-s\-ya
stro\-kakh, vyzva\-n\-n\-ye po\-d\-s\-ta\-no\-v\-ko{\u i}
klyu\-che\-vykh si\-m\-vo\-lov, es\-li nu\-zh\-no sra\-v\-nit{\cprime}
dve ve\-r\-s\-ii. Re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye zhe za\-pi\-si
po\-s\-le klyu\-che\-vo\-go slo\-va} \$Log\$ {\cyr
po\-d\-s\-ta\-v\-l\-ya\-yut\-s\-ya, da\-zhe es\-li za\-dan flag}
-kk{\cyr , po\-s\-kol{\cprime}\-ku ikh is\-pol{\cprime}\-zo\-va\-n\-ie
os\-mysle\-no da\-zhe v ta\-ko{\u i} si\-tu\-a\-c\-ii, a tem bo\-l\-ee,
pri ob{\cdprime}edi\-ne\-n\-ii iz\-me\-ne\-ni{\u i}, vne\-se\-n\-nykh v
dve ve\-t\-vi.}

-ko

{\cyr Po\-ro\-zh\-d\-aet ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye stro\-ki,
su\-shche\-s\-t\-vo\-va\-v\-sh\-ie v ra\-bo\-chem fa{\u i}\-le
ne\-po\-s\-re\-d\-s\-t\-ve\-n\-no pe\-red ego
re\-gi\-s\-t\-ra\-c\-ie{\u i}. Na\-p\-ri\-mer, Dlya klyu\-che\-vo\-go
slo\-va} Re\-vi\-s\-ion {\cyr po\-ro\-dit
ide\-n\-ti\-fi\-ka\-ci\-o\-n\-nu\-yu stro\-ku} \$Revision: 1.1 \$ {\cyr
vme\-s\-to stro\-ki} \$Revision: 5.13 \$ {\cyr , es\-li ona ime\-n\-no
tak i vyglya\-de\-la do re\-gi\-s\-t\-ra\-c\-ii.
Is\-pol{\cprime}\-z\-uet\-s\-ya dlya fo\-r\-ma\-tov fa{\u i}\-lov ili
si\-s\-tem, ko\-to\-r\-ye ne pri\-e\-m\-l\-yut iz\-me\-ne\-ni{\u i} v
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rakh,
pro\-i\-s\-kho\-d\-ya\-shchikh vsle\-d\-s\-t\-v\-ie
po\-d\-s\-ta\-no\-vok zna\-che\-ni{\u i} klyu\-che\-vykh
si\-m\-vo\-lov, ili dlya po\-da\-v\-le\-ni\-ya
ne\-zhe\-la\-tel{\cprime}\-nykh \`ef\-fe\-k\-tov. Tak,
chi\-t\-ae\-my{\u i} Va\-mi fa{\u i}l, iz\-vle\-chen iz ar\-khi\-va
ime\-n\-no s \`etim fla\-gom iz-za obi\-li\-ya klyu\-che\-vykh
si\-m\-vo\-lov, ko\-to\-r\-ye nel{\cprime}\-z\-ya
iz\-me\-n\-yat{\cprime}.}

-kb

{\cyr De\-l\-aet to zhe, chto i flag} -kb{\cyr , no vvod-vyvod
osu\-shche\-s\-t\-v\-l\-yaet\-s\-ya ne v te\-k\-s\-to\-vom, a v
dvo\-i\-ch\-nom re\-zhi\-me. Dlya ope\-ra\-ci\-o\-n\-no{\u i}
si\-s\-te\-my ti\-pa} Po\-six {\cyr ili} Unix {\cyr \`eto
be\-s\-s\-m\-y\-sle\-n\-no, no dlya si\-s\-tem ti\-pa} DOS{\cyr , dlya
ini\-ci\-a\-li\-za\-c\-ii ar\-khi\-va,
pre\-d\-na\-z\-na\-che\-n\-no\-go dlya khra\-ne\-ni\-ya dvo\-i\-chnykh
fa{\u i}\-lov nu\-zh\-no is\-pol{\cprime}\-zo\-vat{\cprime}
ko\-ma\-n\-du} rcs -i -kb {\cyr . Ko\-ma\-n\-da zhe} rcsmerge(1) {\cyr
pro\-s\-to ot\-ka\-z\-y\-v\-aet\-s\-ya ra\-bo\-tat{\cprime} s
fla\-gom} -kb.

-kv

{\cyr Po\-d\-s\-ta\-v\-l\-yaet v ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye
ma\-r\-ke\-ry sa\-mi zna\-che\-ni\-ya klyu\-che\-vykh si\-m\-vo\-lov,
no ne sa\-mi klyu\-che\-v\-ye si\-m\-vo\-ly. Sm. ra\-z\-del
AV\-TO\-MA\-TI\-CHE\-S\-KAYa IDE\-N\-TI\-FI\-KA\-CIYa. Na\-p\-ri\-mer,
klyu\-che\-v\-oe slo\-vo} Re\-vi\-s\-ion {\cyr po\-ro\-zh\-d\-aet
ide\-n\-ti\-fi\-ka\-ci\-o\-n\-nu\-yu stro\-ku 5.13 vme\-s\-to
sta\-n\-da\-r\-t\-no\-go} \$Revision: 5.13 \$.

{\cyr Is\-pol{\cprime}\-z\-uet\-s\-ya chto\-by ub\-rat{\cprime} iz
fa{\u i}\-la klyu\-che\-v\-ye slo\-va ti\-pa} \$Revision: \$ {\cyr
dlya ya\-z\-y\-kov, gde \`eto ne\-vo\-z\-mo\-zh\-no sde\-lat{\cprime}
sre\-d\-s\-t\-va\-mi sa\-mo\-go ya\-z\-y\-ka, na\-p\-ri\-mer,
vklyu\-chiv ego v ko\-m\-me\-n\-ta\-ri{\u i}. Od\-na\-ko,
uda\-le\-n\-n\-ye klyu\-che\-v\-ye slo\-va, ne mo\-gut byt{\cprime}
vo\-s\-s\-ta\-no\-v\-le\-ny av\-to\-ma\-ti\-che\-s\-ki.
Opa\-s\-nost{\cprime} po\-te\-ri klyu\-che\-vykh slov ne
po\-z\-vo\-l\-yaet is\-pol{\cprime}\-zo\-vat{\cprime} flag} -kv {\cyr
vme\-s\-te s fla\-gom} -l{\cyr , i po\-to\-mu at\-ri\-but pra\-va
vla\-del{\cprime}\-ca na iz\-me\-ne\-n\-ie ra\-bo\-che\-go fa{\u i}\-la
ot\-me\-n\-yaet\-s\-ya. Dlya re\-da\-k\-ti\-ro\-va\-ni\-ya,
vo\-s\-t\-re\-bu{\u i}\-te fa{\u i}l po\-v\-to\-r\-no bez} -kv.

-p$[$rev$]$

{\cyr Pe\-re\-na\-p\-ra\-v\-l\-yaet vo\-s\-t\-re\-bo\-va\-n\-ny{\u i}
fa{\u i}l v sta\-n\-da\-r\-tny{\u i} vyvod, a ne v ra\-bo\-chi{\u i}
fa{\u i}l. Is\-pol{\cprime}\-z\-uet\-s\-ya, es\-li tre\-b\-uet\-s\-ya
is\-pol{\cprime}\-zo\-vat{\cprime} fa{\u i}l dlya vvo\-da v dru\-gu\-yu
pro\-g\-ra\-m\-mu.}

-q$[$rev$]$

{\cyr Vse so\-o\-b\-shche\-ni\-ya po\-da\-v\-l\-ya\-yut\-s\-ya.
Is\-pol{\cprime}\-z\-uet\-s\-ya v fo\-no\-vom re\-zhi\-me.}

-I$[$rev$]$

{\cyr Di\-a\-lo\-go\-vy{\u i} re\-zhim; pol{\cprime}\-zo\-va\-te\-l\-yu
po\-s\-y\-la\-yut\-s\-ya pri\-g\-la\-she\-ni\-ya dlya vvo\-da i
za\-da\-yut\-s\-ya vo\-p\-ro\-sy, da\-zhe es\-li vvod
osu\-shche\-s\-t\-v\-l\-yaet\-s\-ya ne s te\-r\-mi\-na\-la.}

-ddate

{\cyr Vo\-s\-t\-re\-b\-uet po\-s\-le\-d\-n\-yu\-yu iz ve\-r\-si{\u i}
za\-da\-n\-no{\u i} ve\-t\-vi, vre\-m\-ya i da\-ta
re\-gi\-s\-t\-ra\-c\-ii ko\-to\-ro{\u i} ne po\-z\-zhe, chem} date
{\cyr . Fo\-r\-mat za\-da\-ni\-ya po\-ch\-ti svo\-bo\-d\-ny{\u i}.
Cha\-so\-vo{\u i} po\-yas} LT {\cyr za\-d\-aet me\-s\-t\-n\-oe
vre\-m\-ya. Pra\-vil{\cprime}\-no ra\-s\-po\-z\-na\-yut\-s\-ya
po\-ch\-ti vse ab\-bre\-vi\-a\-tu\-ry na an\-gli{\u i}\-skom
ya\-z\-y\-ke. Pust{\cprime}, na\-p\-ri\-mer, te\-ku\-shch\-ee
vre\-m\-ya 8 cha\-sov ve\-che\-ra, 11 ya\-n\-va\-r\-ya 1990, v
Ti\-kho\-o\-ke\-a\-n\-s\-kom cha\-so\-vom po\-ya\-se SShA (}PST{\cyr ),
chto na 8 cha\-sov po\-z\-zhe, chem v Gri\-n\-vi\-che (}GMT {\cyr ili}
UTC {\cyr --} Co\-o\-r\-di\-na\-ted Uni\-ve\-r\-sal Ti\-me{\cyr ).
To\-g\-da sle\-du\-yu\-shch\-ie fo\-r\-ma\-ty
\`ek\-vi\-va\-le\-n\-tny:}

~

\begin{tabular}{ll}
8:00 pm lt & {\cyr po umo\-l\-cha\-ni\-yu -- se\-go\-d\-n\-ya}\\
4:00 AM, Jan. 12, 1990\\
1990-01-12 04:00:00+00 & {\cyr sta\-n\-dart} ISO 8601 (UTC)\\
1990-01-11 20:00:00-08 & ISO 8601 {\cyr( me\-s\-t\-n\-oe)}\\
1990/01/12 04:00:00 & {\cyr sta\-n\-da\-r\-tny{\u i} fo\-r\-mat} RCS\\
Thu Jan 11 20:00:00 1990 LT & {\cyr vyda\-cha} cti\-me(3) + LT\\
Thu Jan 11 20:00:00 PST 1990 & {\cyr vyda\-cha} date(1)\\
Fri Jan 12 04:00:00 GMT 1990\\
Thu, 11 Jan 1990 20:00:00 -0800 & In\-te\-r\-net RFC 822\\
12-Ja\-n\-ua\-ry-1990, 04:00 WET
\end{tabular}

~

{\cyr Dlya bol{\cprime}\-shi\-n\-s\-t\-va po\-le{\u i}
su\-shche\-s\-t\-vu\-yut zna\-che\-ni\-ya,
is\-pol{\cprime}\-zu\-e\-m\-ye po umo\-l\-cha\-ni\-yu. Cha\-so\-vo{\u
i} po\-yas --} UTC{\cyr , no flag} -z {\cyr mo\-zhet \`eto
iz\-me\-nit{\cprime}. Po\-r\-ya\-dok v zna\-che\-ni\-yakh po
umo\-l\-cha\-ni\-yu: god, me\-s\-yac, den{\cprime}, chas, se\-ku\-n\-da
(na\-chi\-na\-ya s bo\-l\-ee kru\-p\-nykh edi\-nic -- "}big
en\-dian{\cyr " fo\-r\-mat). Es\-li so fla\-gom ne za\-da\-ny
ka\-k\-ie-to edi\-ni\-cy, to oni, na\-chi\-na\-ya s sa\-mykh
kru\-p\-nykh do pe\-r\-vo\-go za\-da\-n\-no\-go po\-l\-ya,
po\-la\-ga\-yut\-s\-ya ra\-v\-n\-y\-mi ikh zna\-che\-ni\-yu v
te\-ku\-shchem vre\-me\-ni v za\-da\-n\-nom cha\-so\-vom po\-ya\-se;
os\-tal{\cprime}\-n\-ye po\-la\-ga\-yut\-s\-ya ra\-v\-n\-y\-mi ikh
mi\-ni\-mal{\cprime}\-no\-mu zna\-che\-ni\-yu. Na\-p\-ri\-mer, es\-li
ne za\-da\-na flag} -z{\cyr , to v pri\-me\-re vyshe, flag} -d20,10:30
{\cyr ra\-v\-no\-si\-len} -d"1990/01/20 10:30:00"{\cyr .
Ob\-ra\-ti\-te vni\-ma\-n\-ie na is\-pol{\cprime}\-zo\-va\-n\-ie
ka\-v\-y\-chek ili ob\-ra\-t\-no{\u i} ko\-so{\u i} che\-r\-ty, es\-li
stro\-ka s da\-to{\u i} so\-de\-r\-zhit pro\-bel.}

-M$[$rev$]$

{\cyr Pri\-s\-v\-oit{\cprime} at\-ri\-bu\-tu vre\-me\-ni
po\-s\-le\-d\-ne\-go iz\-me\-ne\-ni\-ya ra\-bo\-che\-go fa{\u i}\-la
vre\-m\-ya re\-gi\-s\-t\-ra\-c\-ii vo\-s\-t\-re\-bo\-va\-n\-no{\u i}
ve\-r\-s\-ii. Is\-pol{\cprime}\-zu{\u i}\-te \`etu
vo\-z\-mo\-zh\-nost{\cprime} s os\-to\-ro\-zh\-nost{\cprime}\-yu:
po\-s\-t\-ro\-e\-n\-ie (v cha\-s\-t\-no\-s\-ti,
ko\-m\-pi\-l\-ya\-ci\-ya) bu\-det po\-da\-v\-le\-no , es\-li
pro\-vo\-di\-los{\cprime} po\-s\-t\-ro\-e\-n\-ie so sta\-ro{\u i}
ve\-r\-s\-ie{\u i} po\-s\-le re\-gi\-s\-t\-ra\-c\-ii no\-vo{\u i}
ve\-r\-s\-ii. Sm.} ma\-ke(1).

-sstate

{\cyr Vo\-s\-t\-re\-b\-uet iz za\-da\-n\-no{\u i} ve\-t\-vi
po\-s\-le\-d\-n\-yu\-yu iz ve\-r\-si{\u i} so sta\-tu\-som} state .

-T

{\cyr So\-kh\-ra\-n\-yaet da\-tu i vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya ra\-bo\-che\-go fa{\u i}\-la da\-zhe es\-li v ne\-go
byla za\-ne\-se\-na ot\-me\-t\-ka o bro\-ni\-ro\-va\-n\-ii. Ta\-k\-oe
po\-ve\-de\-n\-ie fla\-ga vvo\-dit v za\-b\-lu\-zh\-de\-ni\-yu
ko\-ma\-n\-du} ma\-ke(1) {\cyr i, po\-to\-mu ne\-o\-b\-kho\-di\-ma
os\-to\-ro\-zh\-nost{\cprime}. Flag} -T {\cyr po\-z\-vo\-l\-yaet
iz\-be\-zhat{\cprime} ne\-nu\-zhnykh po\-s\-t\-ro\-e\-ni{\u i}
(ko\-m\-pi\-l\-ya\-ci{\u i}), no on mo\-zhet po\-da\-vit{\cprime} ikh i
to\-g\-da, ko\-g\-da iz\-me\-ne\-n\-ie
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rov vsle\-d\-s\-t\-v\-ie
bro\-ni\-ro\-va\-ni\-ya su\-shche\-s\-t\-ve\-no dlya
re\-zul{\cprime}\-ta\-ta po\-s\-t\-ro\-e\-ni\-ya.}

-w$[$lo\-gin$]$

{\cyr Vo\-s\-t\-re\-b\-uet po\-s\-le\-d\-n\-yu\-yu iz ve\-r\-si{\u i}
za\-da\-n\-no{\u i} ve\-t\-vi, za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-nu\-yu
pol{\cprime}\-zo\-va\-te\-lem} lo\-gin {\cyr . Es\-li im\-ya} lo\-gin
{\cyr opu\-shche\-no, po\-d\-ra\-zu\-me\-v\-aet\-s\-ya im\-ya
vyzva\-v\-she\-go pol{\cprime}\-zo\-va\-te\-l\-ya.}

-jjoinlist

{\cyr So\-z\-d\-aet no\-vu\-yu ve\-r\-si\-yu, pri\-me\-niv k
pe\-r\-vo{\u i} ve\-r\-s\-ii} rev1 {\cyr spi\-s\-ka} joinlist {\cyr
iz\-me\-ne\-ni\-ya sde\-la\-n\-n\-ye dlya to\-go, chto\-by
po\-lu\-chit{\cprime} iz vto\-ro{\u i} ve\-r\-s\-ii} rev2 {\cyr
tret{\cprime}\-yu} rev3 {\cyr . Flag stal ru\-di\-me\-n\-ta\-r\-nym
po\-s\-le vklyu\-che\-ni\-ya v pa\-ket} RCS {\cyr ko\-ma\-n\-dy}
rcsmerge(1) {\cyr , no so\-kh\-ra\-nen dlya
so\-v\-me\-s\-ti\-mo\-s\-ti s pre\-d\-y\-du\-shchi\-mi
ve\-r\-si\-ya\-mi.

Spi\-sok} joinlist {\cyr so\-s\-ta\-v\-len iz par vi\-da}
rev2:rev3{\cyr , raz\-de\-le\-n\-nykh za\-p\-ya\-t\-y\-mi, gde}
rev2 {\cyr i} rev3 {\cyr \`eto no\-me\-ra (chi\-s\-lo\-v\-ye ili
si\-m\-vo\-li\-che\-s\-k\-ie) ve\-r\-si{\u i}. Pe\-r\-vo{\u i} v \`etom
spi\-s\-ke za\-d\-aet\-s\-ya ve\-r\-si\-ya} rev1 {\cyr ko\-to\-ra\-ya
op\-re\-de\-l\-yaet ve\-r\-si\-yu k ko\-to\-ro{\u i} bu\-dut
pri\-me\-n\-yat{\cprime}\-s\-ya os\-tal{\cprime}\-n\-ye fla\-gi (}-f,
..., -w){\cyr . Es\-li par bo\-l\-ee od\-no{\u i}, to dlya
ka\-zh\-do{\u i} po\-s\-le\-du\-yu\-shche{\u i} pa\-ry, rol{\cprime}}
rev1 {\cyr bu\-det is\-po\-l\-n\-yat{\cprime} re\-zul{\cprime}\-tat
pri\-me\-ne\-ni\-ya ko\-ma\-n\-dy k pre\-d\-y\-du\-shche{\u i} pa\-re.

To chto k pe\-r\-vo{\u i} ve\-r\-s\-ii pri\-me\-n\-ya\-yut\-s\-ya
lish{\cprime} iz\-me\-ne\-ni\-ya, ve\-du\-shch\-ie ot vto\-ro{\u i}
ve\-r\-s\-ii k tret{\cprime}e{\u i}, im\-eet ne\-s\-kol{\cprime}\-ko
sle\-d\-s\-t\-vi{\u i}. Vo-pe\-r\-vykh, iz\-me\-ne\-ni\-ya,
ve\-du\-shch\-ie ot} rev1 {\cyr k} rev2 {\cyr
ig\-no\-ri\-ru\-yut\-s\-ya. Vo-vto\-rykh, \`eta ope\-ra\-ci\-ya
pe\-re\-s\-ta\-no\-vo\-ch\-na po ot\-no\-she\-ni\-yu k ve\-r\-si\-yam}
rev1 {\cyr i} rev3 {\cyr . V-tret{\cprime}\-ikh, \`eta ope\-ra\-ci\-ya
ob{\cdprime}edi\-n\-yaet iz\-me\-ne\-ni\-ya ve\-du\-shch\-ie ot} rev2
{\cyr k} rev1 {\cyr s iz\-me\-ne\-ni\-ya\-mi ve\-du\-shch\-ie ot} rev2
{\cyr k} rev3{\cyr . Is\-pol{\cprime}\-z\-uet\-s\-ya v dvukh
slu\-cha\-yakh.

Pust{\cprime}} rev1 {\cyr i} rev3 {\cyr ko\-ne\-ch\-n\-ye ve\-r\-s\-ii
dvukh ve\-t\-ve{\u i} s ob\-shchim pre\-d\-kom} rev2{\cyr . To\-g\-da
\`etot flag ob{\cdprime}edi\-nit iz\-me\-ne\-ni\-ya sde\-la\-n\-n\-ye v
fa{\u i}\-le v ra\-m\-kakh dvukh ne\-za\-vi\-si\-mykh pro\-e\-k\-tov,
so\-o\-t\-vet\-s\-t\-vu\-yu\-shchikh dvum ve\-t\-v\-yam. \`Eto
po\-z\-vo\-l\-yaet ne\-s\-kol{\cprime}\-kim lyu\-d\-yam
od\-no\-v\-re\-me\-n\-no ra\-bo\-tat{\cprime} nad od\-nim fa{\u
i}\-lom.

Pust{\cprime} no\-me\-ra ve\-r\-si{\u i} na od\-no{\u i} ve\-t\-vi
udo\-v\-le\-t\-vo\-r\-ya\-yut us\-lo\-vi\-yu} rev1 $<$ rev2 $<$ rev3
{\cyr . To\-g\-da \`etot flag ot\-me\-nit iz\-me\-ne\-ni\-ya
sde\-la\-n\-n\-ye v fa{\u i}\-le v pe\-r\-iod ra\-bo\-ty nad} rev2 .
{\cyr \`Eto po\-z\-vo\-l\-yaet is\-klyu\-chit{\cprime} oshi\-b\-ki,
vne\-se\-n\-n\-ye na ra\-n\-nikh sta\-di\-yakh pro\-e\-k\-ta, ne
pe\-re\-de\-l\-y\-va\-ya za\-no\-vo ra\-bo\-ty, sde\-la\-n\-no{\u i} na
bo\-l\-ee po\-z\-d\-nikh sta\-di\-yakh.

Es\-li iz\-me\-ne\-ni\-ya ve\-du\-shch\-ie ot} rev2 {\cyr k} rev1 {\cyr
i iz\-me\-ne\-ni\-ya ve\-du\-shch\-ie ot} rev2 {\cyr k} rev3 {\cyr byli
pri\-me\-ne\-ny k od\-no{\u i} i to{\u i} zhe cha\-s\-ti fa{\u i}\-la,
pro\-g\-ra\-m\-ma vydast so\-o\-b\-shche\-n\-ie tak, kak opi\-sa\-no v}
me\-r\-ge(1).

{\cyr Dlya pe\-r\-vo{\u i} pa\-ry mo\-zh\-no opu\-s\-tit{\cprime}} rev2
{\cyr , i to\-g\-da bu\-det is\-pol{\cprime}\-zo\-van ob\-shchi{\u i}
pre\-dok. Es\-li ka\-ko{\u i}-li\-bo iz ar\-gu\-me\-n\-tov
pre\-d\-s\-ta\-v\-l\-yaet so\-bo{\u i} vetv{\cprime},
is\-pol{\cprime}\-z\-uet\-s\-ya po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya
\`eto{\u i} ve\-t\-vi. Po\-s\-kol{\cprime}\-ku flag} -l {\cyr
bro\-ni\-r\-uet} rev1 {\cyr , chto po\-d\-ra\-zu\-me\-v\-aet
za\-pis{\cprime} re\-zul{\cprime}\-ta\-ta v
so\-o\-t\-vet\-s\-t\-vu\-yu\-shchu\-yu e{\u i} vetv{\cprime},
ope\-ra\-ci\-ya ne po\-l\-nost{\cprime}\-yu si\-m\-me\-t\-ri\-ch\-na
ot\-no\-si\-tel{\cprime}\-no pe\-r\-vo{\u i} i tret{\cprime}e{\u i}
ve\-r\-si{\u i}.}

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr v
sta\-n\-da\-r\-tny{\u i} vyvod.}

-Vn

{\cyr Imi\-ti\-r\-uet ra\-bo\-tu} RCS {\cyr ve\-r\-s\-ii} n,
n=3,4,5{\cyr . Is\-pol{\cprime}\-z\-uet\-s\-ya pri ob\-me\-ne fa{\u
i}\-lov s ko\-r\-re\-s\-po\-n\-de\-n\-ta\-mi,
is\-pol{\cprime}\-zu\-yu\-shchi\-mi sta\-r\-ye ve\-r\-s\-ii
pro\-g\-ramm. Dlya to\-go, chto\-by op\-re\-de\-lit{\cprime},
ka\-ku\-yu ve\-r\-si\-yu} RCS {\cyr is\-pol{\cprime}\-z\-uet vash
pa\-r\-t\-ner, is\-pol{\cprime}\-zu{\u i}\-te} rcs -V; {\cyr es\-li
\`eto ne sra\-bo\-ta\-lo, vyzo\-vi\-te} rlog {\cyr dlya
ar\-khi\-v\-no\-go fa{\u i}\-la. Es\-li pe\-r\-v\-ye sto\-ki vyda\-chi
ne so\-de\-r\-zhat slo\-va} branch ({\cyr vetv{\cprime}): to \`eto
ve\-r\-si\-ya 3; es\-li v fo\-r\-ma\-te da\-ty dlya go\-da
is\-pol{\cprime}\-zo\-va\-ny dve ci\-f\-ry, \`eto ve\-r\-si\-ya 4; v
os\-tal{\cprime}\-nykh slu\-cha\-yakh \`eto 5 ve\-r\-si\-ya. Pri
\`emu\-l\-ya\-c\-ii ve\-r\-s\-ii 3 ar\-khiv te\-r\-yaet svo{\u i}\-stvo
so\-de\-r\-zhat{\cprime} ve\-t\-vi, dlya 4 ve\-r\-s\-ii ili bo\-l\-ee
ra\-n\-nikh ot\-me\-t\-ka vre\-me\-ni mo\-zhet
iz\-me\-nit{\cprime}\-s\-ya na ve\-li\-chi\-nu do 13 cha\-sov,
me\-n\-yaet\-s\-ya fo\-r\-mat da\-ty na} yy/mm/dd {\cyr i fo\-r\-ma\-ty
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rov so\-de\-r\-zhat
in\-ye ra\-z\-de\-li\-te\-li.}

-xsuffixes

{\cyr Is\-pol{\cprime}\-zo\-vat{\cprime} su\-f\-fi\-k\-sy} suffixes
{\cyr dlya po\-is\-ka ar\-khi\-v\-nykh fa{\u i}\-lov}
RCS{\cyr . Sm.} ci(1){\cyr .}

-zzone

{\cyr Za\-d\-aet fo\-r\-mat da\-ty i vre\-me\-ni i cha\-so\-vo{\u i}
po\-yas pri po\-d\-s\-ta\-no\-v\-ke klyu\-che\-vykh slov v
ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye ma\-r\-ke\-ry v ra\-bo\-chem fa{\u
i}\-le so fla\-gom} -ddate {\cyr . Pa\-ra\-metr} zone {\cyr do\-l\-zhen
byt{\cprime} li\-bo pust, li\-bo ya\-v\-l\-yat{\cprime}\-s\-ya
chi\-s\-le\-n\-nym zna\-che\-n\-iem ot\-klo\-ne\-ni\-ya ot
Vse\-mi\-r\-no\-go Vre\-me\-ni (}UTC{\cyr ) , li\-bo
spe\-c\-ial{\cprime}\-no{\u i} stro\-ko{\u i}} LT{\cyr ,
za\-da\-yu\-shche{\u i} is\-pol{\cprime}\-zo\-va\-n\-ie
me\-s\-t\-no\-go vre\-me\-ni. Po umo\-l\-cha\-ni\-yu, ili
opu\-shche\-n\-ny{\u i} pa\-ra\-metr} zone , {\cyr za\-da\-yut
is\-pol{\cprime}\-zo\-va\-n\-ie Vse\-mi\-r\-no\-go Vre\-me\-ni s
is\-pol{\cprime}\-zo\-va\-n\-iem ko\-so{\u i} che\-r\-ty v
ka\-che\-s\-t\-ve ra\-z\-de\-li\-te\-l\-ya po\-le{\u i} dlya da\-ty
(sm. pri\-mer). V os\-tal{\cprime}\-nykh slu\-cha\-yakh
is\-pol{\cprime}\-z\-uet\-s\-ya sta\-n\-dart} ISO 8601{\cyr .
Na\-p\-ri\-mer, pust{\cprime} te\-ku\-shch\-ee vre\-m\-ya 8 cha\-sov
ve\-che\-ra, 11 ya\-n\-va\-r\-ya 1990, v Ti\-kho\-o\-ke\-a\-n\-s\-kom
cha\-so\-vom po\-ya\-se SShA (chto na 8 cha\-sov po\-z\-zhe, chem v
Gri\-n\-vi\-che). To\-g\-da dlya po\-d\-s\-ta\-no\-vok bu\-det
is\-pol{\cprime}\-zo\-va\-no}

~

\begin{tabular}{ll}
{\cyr flag} & {\cyr fo\-r\-mat vre\-me\-ni}\\
-z & 1990/01/12 04:00:00 {\cyr (po umo\-l\-cha\-ni\-yu)}\\
-zLT & 1990-01-11 20:00:00-08\\
-z+05:30 & 1990-01-12 09:30:00+05:30
\end{tabular}

~

{\cyr Flag} -z {\cyr vli\-yaet tol{\cprime}\-ko na ma\-r\-ke\-ry, i ne
me\-n\-yaet fo\-r\-ma\-ta da\-ty i vre\-me\-ni v ar\-khi\-v\-nom fa{\u
i}\-le, ko\-to\-r\-ye vse\-g\-da za\-d\-aet\-s\-ya vo Vse\-mi\-r\-nom
Vre\-me\-ni.

AV\-TO\-MA\-TI\-CHE\-S\-KAYa IDE\-N\-TI\-FI\-KA\-CIYa

Es\-li v te\-k\-s\-te fa{\u i}\-la vstre\-cha\-yut\-s\-ya
vyra\-zhe\-ni\-ya vi\-da} \$ke\-y\-word\$ {\cyr ili}
\$ke\-y\-word:...\$ {\cyr , gde} ke\-y\-word {\cyr od\-no iz
opi\-sa\-n\-nykh ni\-zhe klyu\-che\-vykh slov, to oni
za\-me\-n\-ya\-yut\-s\-ya ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-y\-mi
ma\-r\-ke\-ra\-mi -- stro\-ka\-mi vi\-da} \$ke\-y\-word:{\cyr
zna\-che\-n\-ie\$ . Ob\-ychno ikh vsta\-v\-l\-ya\-yut v
ko\-m\-me\-n\-ta\-r\-ii ili stro\-ko\-v\-ye pe\-re\-me\-n\-n\-ye
pro\-g\-ramm -- dlya ra\-s\-po\-z\-na\-va\-ni\-ya ve\-r\-si{\u i}.

Kak pra\-vi\-lo, na\-chal{\cprime}\-na\-ya ve\-r\-si\-ya
so\-de\-r\-zhit ide\-n\-ti\-fi\-ka\-ci\-o\-n\-n\-ye ma\-r\-ke\-ry v
vi\-de} \$ke\-y\-word\${\cyr . Po\-d\-s\-ta\-no\-v\-ka zna\-che\-ni\-ya
pro\-i\-s\-kho\-dit pri vo\-s\-t\-re\-bo\-va\-n\-ii: ko\-ma\-n\-da} co
{\cyr za\-me\-nit ta\-ko{\u i} ma\-r\-ker ma\-r\-ke\-rom vi\-da}
\$ke\-y\-word:{\cyr zna\-che\-n\-ie\$ . V slu\-ch\-ae, es\-li
re\-gi\-s\-t\-ri\-r\-ue\-my{\u i} ra\-bo\-chi{\u i} fa{\u i}l uzhe
so\-de\-r\-zhit zna\-che\-ni\-ya klyu\-che\-vykh slov, to sta\-r\-ye
zna\-che\-ni\-ya khra\-n\-yat\-s\-ya v ar\-khi\-ve i bu\-dut
iz\-me\-ne\-ny tol{\cprime}\-ko pri vo\-s\-t\-re\-bo\-va\-n\-ii.
(No\-v\-ye zna\-che\-ni\-ya to\-zhe khra\-n\-yat\-s\-ya, no v dru\-gom
vi\-de.) Ta\-kim ob\-ra\-zom, ob\-no\-v\-le\-n\-ie
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rov
so\-ve\-r\-sh\-aet\-s\-ya ko\-ma\-n\-do{\u i}} co {\cyr
av\-to\-ma\-ti\-che\-s\-ki, no flag} -k {\cyr mo\-zhet
iz\-me\-nit{\cprime} ta\-k\-oe po\-ve\-de\-n\-ie.

KLYu\-CHE\-V\-YE SLO\-VA I IKh ZNA\-chE\-NI\-Ya:}

\$Au\-t\-hor\$

{\cyr Im\-ya (}lo\-gin na\-me{\cyr ) pol{\cprime}\-zo\-va\-te\-l\-ya
za\-re\-gi\-s\-t\-ri\-ro\-va\-v\-she\-go da\-n\-nu\-yu ve\-r\-si\-yu.}

\$Da\-te\$

{\cyr Da\-ta i vre\-m\-ya re\-gi\-s\-t\-ra\-c\-ii ve\-r\-s\-ii. Flag}
-zzone {\cyr do\-ba\-vit chi\-s\-lo\-v\-oe zna\-che\-n\-ie
cha\-so\-vo\-go po\-ya\-sa, po umo\-l\-cha\-ni\-yu
is\-pol{\cprime}\-z\-uet\-s\-ya Vse\-mi\-r\-n\-oe Vre\-m\-ya.}

\$He\-a\-der\$

{\cyr Sta\-n\-da\-r\-tny{\u i} za\-go\-lo\-vok. So\-de\-r\-zhit
po\-l\-n\-oe im\-ya fa{\u i}\-la s ab\-so\-l\-yu\-t\-no{\u i}
fo\-r\-mo{\u i} uka\-za\-ni\-ya pu\-ti, no\-mer ve\-r\-s\-ii, da\-tu i
vre\-m\-ya re\-gi\-s\-t\-ra\-c\-ii, av\-to\-ra, sta\-tus i im\-ya
pol{\cprime}\-zo\-va\-te\-l\-ya, za\-b\-ro\-ni\-ro\-va\-v\-she\-go
ve\-r\-si\-yu dlya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i} (es\-li \`eto
tak). Flag} -zzone {\cyr do\-ba\-vit chi\-s\-lo\-v\-oe zna\-che\-n\-ie
cha\-so\-vo\-go po\-ya\-sa, po umo\-l\-cha\-ni\-yu
is\-pol{\cprime}\-z\-uet\-s\-ya Vse\-mi\-r\-n\-oe Vre\-m\-ya.}

\$Id\$

{\cyr To zhe, chto i} \$He\-a\-der\${\cyr , no im\-ya fa{\u i}\-la ne
so\-de\-r\-zhit put{\cprime}.}

\$Locker\$

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya,
za\-b\-ro\-ni\-ro\-va\-v\-she\-go ve\-r\-si\-yu dlya vne\-se\-ni\-ya
iz\-me\-ne\-ni{\u i}. Pu\-s\-ta\-ya stro\-ka, es\-li fa{\u i}l ne
za\-b\-ro\-ni\-ro\-van.}

\$Log\$

{\cyr Re\-gi\-s\-t\-ra\-ci\-o\-n\-na\-ya za\-pis{\cprime},
vne\-se\-n\-na\-ya pri re\-gi\-s\-t\-ra\-c\-ii so sta\-n\-da\-r\-tnym
za\-go\-lo\-v\-kom vpe\-re\-di. No\-va\-ya
re\-gi\-s\-t\-ra\-ci\-o\-n\-na\-ya za\-pis{\cprime} ne za\-ti\-r\-aet
sta\-ru\-yu, a do\-ba\-v\-l\-yaet\-s\-ya k ne{\u i}. \`Eto
po\-z\-vo\-l\-yaet khra\-nit{\cprime} v sa\-mom fa{\u i}\-le
is\-to\-ri\-yu ego iz\-me\-ne\-ni{\u i}.

Po\-d\-s\-t\-ro\-ka, sto\-ya\-shcha\-ya pe\-red si\-m\-vo\-lom} \$Log\$
{\cyr , do\-ba\-v\-l\-yaet\-s\-ya pe\-red ka\-zh\-do{\u i} stro\-ko{\u
i} re\-gi\-s\-t\-ra\-c\-io\-n\-nykh za\-pi\-se{\u i}. Na\-p\-ri\-mer,
es\-li \`eta stro\-ka vyglya\-dit kak " //} \$Log: tan.cc \$" {\cyr ,
to pe\-red ka\-zh\-do{\u i} stro\-ko{\u i}
re\-gi\-s\-t\-ra\-c\-io\-n\-nykh za\-pi\-se{\u i} bu\-det
do\-ba\-v\-le\-no " // " , chto udo\-b\-no dlya ya\-z\-y\-kov
pro\-g\-ra\-m\-mi\-ro\-va\-ni\-ya, gde ko\-m\-me\-n\-ta\-r\-ii
pro\-do\-l\-zha\-yut\-s\-ya do ko\-n\-ca stro\-ki. Dlya dru\-gikh
ya\-z\-y\-kov re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye za\-pi\-si
po\-me\-shcha\-yut vnutr{\cprime} mno\-go\-s\-t\-ro\-ch\-no\-go
ko\-m\-me\-n\-ta\-ri\-ya. Tak, dlya ya\-z\-y\-ka} C {\cyr ,
re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye za\-pi\-si pre\-v\-ra\-t\-yat\-s\-ya
v ka\-no\-ni\-che\-s\-ki{\u i} ko\-m\-me\-n\-ta\-ri{\u i},
ot\-me\-che\-ny{\u i} zve\-z\-do\-ch\-ka\-mi, es\-li pri
ini\-ci\-a\-li\-za\-c\-ii ar\-khi\-va ofo\-r\-mit{\cprime} ego v
vi\-de}

/$\star$

~$\star$ \$Log\$

~$\star$/

{\cyr Dlya so\-v\-me\-s\-ti\-mo\-s\-ti s pre\-zh\-ni\-mi
ve\-r\-si\-ya\-mi, dlya pre\-fi\-k\-sov vi\-da /$\star$ ili ($\star$ ,
vo\-z\-mo\-zh\-no, s do\-po\-l\-ni\-tel{\cprime}\-n\-y\-mi
pro\-be\-la\-mi, vnu\-t\-re\-n\-n\-ie stro\-ki so\-de\-r\-zhat pro\-bel
vme\-s\-to / ili (; od\-na\-ko, v dal{\cprime}\-ne{\u i}\-shikh
ve\-r\-si\-yakh, \`eto svo{\u i}\-stvo ne bu\-det so\-kh\-ra\-ne\-no.}

\$Na\-me\$

{\cyr Si\-m\-vo\-li\-che\-s\-k\-oe im\-ya,
is\-pol{\cprime}\-zo\-va\-n\-n\-oe pri iz\-vle\-che\-n\-ii fa{\u i}\-la
iz ar\-khi\-va. Na\-p\-ri\-mer,} co -rJoe {\cyr po\-ro\-dit} \$Na\-me:
Joe \$ . {\cyr Pro\-s\-to} co {\cyr po\-ro\-dit pro\-s\-to} \$Na\-me:
\$.

\$rcsfile\$

{\cyr Im\-ya fa{\u i}\-la, bez pu\-ti.}

\$Revision\$

{\cyr No\-mer ve\-r\-s\-ii.}

\$Source\$

{\cyr Po\-l\-n\-oe im\-ya fa{\u i}\-la s ab\-so\-l\-yu\-t\-nym
za\-da\-n\-iem pu\-ti.}

\$Sta\-te\$

{\cyr Sta\-tus za\-da\-n\-ny{\u i} fla\-gom} -s {\cyr ko\-mand} rcs(1)
{\cyr ili} ci(1).

{\cyr Es\-li dlya pri\-da\-ni\-ya ide\-n\-ti\-fi\-ka\-c\-io\-n\-nym
ma\-r\-ke\-ram kra\-si\-vo\-go vi\-da po\-t\-re\-bu\-yut\-s\-ya
ni\-zhe\-s\-le\-du\-yu\-shch\-ie si\-m\-vo\-ly, to oni mo\-gut
byt{\cprime} za\-da\-ny s po\-moshch{\cprime}\-yu ob\-ra\-t\-no{\u i}
ko\-so{\u i} che\-r\-ty.}

~

\begin{tabular}{ll}
{\cyr si\-m\-vo}l & {\cyr pre\-d\-s\-ta\-v\-le\-n\-ie}\\
tab & $\backslash$t\\
ne\-w\-li\-ne & $\backslash$n\\
spa\-ce & $\backslash$040\\
\$ & $\backslash$044\\
$\backslash$ & $\backslash$$\backslash$
\end{tabular}

~

{\cyr AT\-RI\-BU\-TY FA{\u I}\-LOV

Ra\-bo\-chi{\u i} fa{\u i}l na\-s\-le\-d\-uet vse
ra\-z\-re\-she\-ni\-ya na chte\-n\-ie i vypo\-l\-ne\-n\-ie ot
ar\-khi\-v\-no\-go fa{\u i}\-la. Ra\-z\-re\-she\-n\-ie na
iz\-me\-ne\-n\-ie fa{\u i}\-la vla\-del{\cprime}\-cu daet\-s\-ya
vse\-g\-da, kro\-me dvukh slu\-ch\-aev: li\-bo byl
is\-pol{\cprime}\-zo\-van flag} -kv {\cyr li\-bo fa{\u i}l ne
za\-b\-ro\-ni\-ro\-van ni\-kem dlya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u
i} pri stro\-go{\u i} pro\-ve\-r\-ke bro\-ni\-ro\-va\-ni\-ya (sm.}
rcs(1)).

{\cyr Es\-li ra\-bo\-chi{\u i} fa{\u i}l uzhe su\-shche\-s\-t\-v\-uet,
i pol{\cprime}\-zo\-va\-tel{\cprime} im\-eet pra\-vo ego
iz\-me\-n\-yat{\cprime}, to ko\-ma\-n\-da} co {\cyr za\-p\-ro\-sit
ra\-z\-re\-she\-n\-ie na za\-ti\-ra\-n\-ie sta\-ro\-go ra\-bo\-che\-go
fa{\u i}\-la i ava\-ri{\u i}\-no pre\-r\-vet ra\-bo\-tu, es\-li ne
po\-lu\-chit ra\-z\-re\-she\-ni\-ya ili ta\-ko{\u i} za\-p\-ros
ne\-vo\-z\-mo\-zhen. Es\-li zhe fa{\u i}l za\-k\-ryt dlya
iz\-me\-ne\-ni{\u i} ili za\-dan flag} -f {\cyr , to sta\-ry{\u i}
ra\-bo\-chi{\u i} fa{\u i}l za\-ti\-r\-aet\-s\-ya bez
pre\-du\-p\-re\-zh\-de\-ni\-ya.

IME\-NA FA{\u I}\-LOV

Ko\-ma\-n\-da} co {\cyr ishchet fa{\u i}\-ly tak zhe, kak i
ko\-ma\-n\-da} ci(1) {\cyr , za is\-klyu\-che\-n\-iem to\-go, chto e{\u
i} ne nu\-zh\-no chi\-tat{\cprime} ra\-bo\-chi{\u i} fa{\u i}l, es\-li
no\-mer ve\-r\-s\-ii ne za\-dan si\-m\-vo\-lom \$ .

PE\-RE\-ME\-N\-N\-YE SRE\-DY}

LO\-G\-NA\-ME

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya. V} UNIX {\cyr za\-da\-no
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}}

set LO\-G\-NA\-ME={\cyr im\-ya-pol{\cprime}\-zo\-va\-te\-l\-ya}

TZ

{\cyr Cha\-so\-vo{\u i} po\-yas. V} UNIX {\cyr za\-dan
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}} set.

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Ne za\-bud{\cprime}\-te, chto ne\-o\-b\-kho\-di\-my
me\-ry dlya to\-go, chto\-by pro\-be\-ly me\-zh\-du fla\-ga\-mi ne byli
ob\-ra\-bo\-ta\-ny ko\-ma\-n\-dnym in\-te\-r\-p\-re\-ta\-to\-rom
pre\-zh\-de\-v\-re\-me\-n\-no, za\-shchi\-shcha{\u i}\-te ikh,
na\-p\-ri\-mer, ka\-v\-y\-ch\-ka\-mi. Sm.} ci(1) .

{\cyr SO\-O\-B\-SHCHE\-NI\-Ya

Dlya ka\-zh\-do{\u i} vo\-s\-t\-re\-bu\-e\-mo{\u i} ve\-r\-s\-ii
ka\-zh\-do\-go fa{\u i}\-la ko\-ma\-n\-da} co {\cyr pe\-cha\-t\-aet
im\-ya ar\-khi\-v\-no\-go fa{\u i}\-la, im\-ya ra\-bo\-che\-go fa{\u
i}\-la i no\-mer iz\-vle\-ka\-e\-mo{\u i} ve\-r\-s\-ii.
Vo\-z\-v\-ra\-shch\-aet ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0
to\-g\-da i tol{\cprime}\-ko to\-g\-da, ko\-g\-da vse ope\-ra\-c\-ii
za\-ve\-r\-shi\-lis{\cprime} us\-pe\-sh\-no.

SM. TA\-K\-ZHE}

ctime(3), date(1), make(1),

rcsintro(1), ci(1), rcs(1), rcsfile(5),

ident(1), rcsclean(1), rcsdiff(1), rcsmerge(1), rlog(1)


Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


{\cyr OG\-RA\-NI\-CHE\-NI\-Ya

Si\-s\-te\-m\-n\-ye (zhe\-s\-t\-k\-ie) li\-n\-ki k ra\-bo\-chim i
ar\-khi\-v\-nym fa{\u i}\-lam ne so\-kh\-ra\-n\-ya\-yut\-s\-ya. Sm.}
ci(1) {\cyr VRE\-ME\-N\-N\-YE FA{\u I}\-LY I LI\-N\-KI.

Ne su\-shche\-s\-t\-v\-uet sre\-d\-s\-t\-va po\-da\-vit{\cprime}
po\-d\-s\-ta\-no\-v\-ku zna\-che\-ni{\u i} v klyu\-che\-v\-ye slo\-va
sre\-d\-s\-t\-va\-mi} RCS {\cyr kro\-me ino\-go ikh na\-pi\-sa\-ni\-ya.
Dlya te\-k\-s\-tov, is\-pol{\cprime}\-z\-ue\-mykh ko\-ma\-n\-da\-mi}
nroff {\cyr i} troff{\cyr , na\-p\-ri\-mer, \`eto
do\-s\-ti\-g\-aet\-s\-ya po\-me\-shche\-n\-iem v klyu\-che\-v\-oe
slo\-vo nu\-le\-vo\-go si\-m\-vo\-la $\backslash$}\&.

\chapter{RCS(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rcs - {\cyr iz\-me\-ne\-n\-ie vnu\-t\-re\-n\-nikh at\-ri\-bu\-tov
ar\-khi\-v\-no\-go fa{\u i}\-la

FO\-R\-MAT KO\-MA\-N\-DY}

rcs {\cyr fla\-gi im\-ya-fa{\u i}\-la ...

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} rcs {\cyr so\-z\-d\-aet no\-vy{\u i} ar\-khi\-v\-ny{\u
i} fa{\u i}l v si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS {\cyr , ili iz\-me\-n\-yaet at\-ri\-bu\-ty
su\-shche\-s\-t\-vu\-yu\-shche\-go. Ar\-khi\-v\-ny{\u i} fa{\u i}l
so\-de\-r\-zhit na\-bor ve\-r\-si{\u i} ra\-bo\-che\-go fa{\u i}\-la,
spi\-sok lic ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u
i}\-la, is\-to\-ri\-yu iz\-me\-ne\-ni{\u i} fa{\u i}\-la i ne\-k\-ie
vnu\-t\-re\-n\-n\-ie up\-ra\-v\-l\-ya\-yu\-shch\-ie at\-ri\-bu\-ty.
Pol{\cprime}\-zo\-va\-tel{\cprime} mo\-zhet ra\-bo\-tat{\cprime} s
ko\-ma\-n\-do{\u i}} rcs {\cyr , es\-li vypo\-l\-ne\-no od\-no iz
sle\-du\-yu\-shchikh us\-lo\-vi{\u i}: li\-bo on uzhe vne\-sen v
spi\-sok lic ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u
i}\-la, li\-bo \`etot spi\-sok pust, li\-bo
pol{\cprime}\-zo\-va\-tel{\cprime} ya\-v\-l\-yaet\-s\-ya
vla\-del{\cprime}\-cem fa{\u i}\-la ili si\-s\-te\-m\-nym
ad\-mi\-ni\-s\-t\-ra\-to\-rom, li\-bo ko\-ma\-n\-da
vypo\-l\-n\-yaet\-s\-ya s fla\-gom} -i .

{\cyr Po\-l\-n\-oe im\-ya fa{\u i}\-la, so\-de\-r\-zha\-shch\-ee
ar\-khi\-v\-ny{\u i} su\-f\-fiks, so\-o\-t\-vet\-s\-t\-v\-uet
ar\-khi\-v\-no\-mu fa{\u i}\-lu, vse pro\-ch\-ie schi\-ta\-yut\-s\-ya
ra\-bo\-chi\-mi fa{\u i}\-la\-mi. O so\-o\-t\-vet\-s\-t\-v\-ii imen
fa{\u i}\-lov, sm.} ci(1) {\cyr . Tam zhe opi\-sa\-ny spo\-so\-by
za\-da\-ni\-ya no\-me\-rov ve\-r\-si{\u i}.

FLA\-GI}

-i

{\cyr So\-z\-d\-aet i ini\-ci\-a\-li\-zi\-r\-uet no\-vy{\u i}
ar\-khi\-v\-ny{\u i} fa{\u i}l, ne za\-no\-s\-ya v ne\-go ni\-ka\-kikh
ve\-r\-si{\u i} ra\-bo\-che\-go fa{\u i}\-la. Es\-li ne za\-dan
put{\cprime} k ar\-khi\-v\-no\-mu fa{\u i}\-lu, ona sna\-cha\-la
pytaet\-s\-ya po\-me\-s\-tit{\cprime} ar\-khiv v po\-d\-ka\-ta\-lo\-ge}
RCS {\cyr , za\-tem, v te\-ku\-shchem ka\-ta\-lo\-ge. Es\-li ar\-khiv
uzhe su\-shche\-s\-t\-v\-uet, vydaet so\-o\-b\-shche\-n\-ie ob
oshi\-b\-ke.}

-alo\-gins

{\cyr Do\-ba\-v\-l\-yaet ime\-na, pe\-re\-chi\-s\-le\-n\-n\-ye v
stro\-ke bez pro\-be\-lov} lo\-gins {\cyr v spi\-sok lic
ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u i}\-la. V
ka\-che\-s\-t\-ve ra\-z\-de\-li\-te\-le{\u i}
is\-pol{\cprime}\-zu\-yut\-s\-ya za\-p\-ya\-t\-ye.}

-Ao\-l\-d\-fi\-le

{\cyr Do\-ba\-v\-l\-yaet ime\-na, pe\-re\-chi\-s\-le\-n\-n\-ye v
spi\-s\-ke lic ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u
i}\-la} ol\-dfi\-le {\cyr k spi\-s\-ku lic ime\-yu\-shchikh do\-s\-tup
k iz\-me\-ne\-ni\-yu da\-n\-no\-go fa{\u i}\-la.}

-e$[$lo\-gins$]$

{\cyr Uda\-l\-yaet ime\-na, pe\-re\-chi\-s\-le\-n\-n\-ye v stro\-ke bez
pro\-be\-lov} lo\-gins {\cyr iz spi\-s\-ka lic ime\-yu\-shchikh
do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u i}\-la. V ka\-che\-s\-t\-ve
ra\-z\-de\-li\-te\-le{\u i} is\-pol{\cprime}\-zu\-yut\-s\-ya
za\-p\-ya\-t\-ye. Es\-li stro\-ka} lo\-gins {\cyr
ot\-sut\-s\-t\-v\-uet, po\-l\-nost{\cprime}\-yu ochi\-shch\-aet \`etot
spi\-sok.}

-b$[$rev$]$

{\cyr Us\-ta\-na\-v\-li\-v\-aet no\-mer ve\-t\-vi, ko\-to\-ra\-ya
bu\-det is\-pol{\cprime}\-zo\-va\-na po umo\-l\-cha\-ni\-yu,
ra\-v\-nym} rev {\cyr . Es\-li} rev {\cyr opu\-shchen, to po
umo\-l\-cha\-ni\-yu is\-pol{\cprime}\-z\-uet\-s\-ya
(di\-na\-mi\-che\-s\-ki) sa\-ma\-ya po\-s\-le\-d\-n\-ya\-ya
po\-bo\-ch\-na\-ya vetv{\cprime} ve\-r\-si{\u i},
ot\-kho\-d\-ya\-shcha\-ya ot gla\-v\-no{\u i}.}

-cstring

{\cyr Us\-ta\-na\-v\-li\-v\-aet pre\-fiks dlya
ko\-m\-me\-n\-ta\-r\-iev. Pri pe\-r\-vo\-na\-chal{\cprime}\-no{\u i}
re\-gi\-s\-t\-ra\-c\-ii fa{\u i}\-la bez ini\-ci\-a\-li\-za\-c\-ii
ko\-ma\-n\-do{\u i}} ci {\cyr ili s ini\-ci\-a\-li\-za\-c\-ie{\u i}
ko\-ma\-n\-do{\u i}} rcs -i {\cyr bez \`eto\-go fla\-ga,} RCS {\cyr
op\-re\-de\-l\-yaet spo\-sob za\-da\-ni\-ya ko\-m\-me\-n\-ta\-r\-iev po
ra\-s\-shi\-re\-ni\-yu ime\-ni ra\-bo\-che\-go fa{\u i}\-la.

Flag so\-kh\-ra\-nen is\-klyu\-chi\-tel{\cprime}\-no dlya
so\-v\-me\-s\-ti\-mo\-s\-ti s pre\-d\-y\-du\-shchi\-mi
ve\-r\-si\-ya\-mi, po\-s\-kol{\cprime}\-ku pri vklyu\-che\-n\-ii
is\-to\-r\-ii iz\-me\-ne\-ni{\u i} v ra\-bo\-chi{\u i} fa{\u i}l po
klyu\-che\-vo\-mu slo\-vu} \$Log\$ , RCS {\cyr vsta\-v\-l\-yaet
pre\-fiks, za\-da\-n\-ny{\u i} \`etim klyu\-che\-vym slo\-vom, pri
vo\-s\-t\-re\-bo\-va\-n\-ii iz ar\-khi\-va (sm.} co(1)){\cyr .
Od\-na\-ko, sta\-r\-ye ve\-r\-s\-ii} RCS {\cyr
is\-pol{\cprime}\-zu\-yut v ta\-kom slu\-ch\-ae pre\-fiks,
za\-da\-n\-ny{\u i} da\-n\-nym fla\-gom. Sle\-do\-va\-tel{\cprime}\-no,
es\-li Vy pla\-ni\-ru\-e\-te is\-pol{\cprime}\-zo\-vat{\cprime} i
sta\-r\-ye i no\-v\-ye ve\-r\-s\-ii, po\-za\-bot{\cprime}\-tes{\cprime}
o so\-o\-t\-vet\-s\-t\-v\-ii pre\-fi\-k\-sa v stro\-ke s} \$Log\$ {\cyr
i pre\-fi\-k\-sa dlya ko\-m\-me\-n\-ta\-r\-iev.}

-ksubst

{\cyr Us\-ta\-na\-v\-li\-v\-aet pra\-vi\-la po\-d\-s\-ta\-no\-v\-ki
klyu\-che\-vykh si\-m\-vo\-lov pri vos\-tre\-bo\-va\-nii fa{\u i}\-la
iz ar\-hi-va. Vo\-z\-mo\-zh\-n\-ye pra\-vi\-la}
subst {\cyr opi\-sa\-ny v} co(1){\cyr . Ya\-v\-n\-oe za\-da\-n\-ie
fla\-ga} -k {\cyr v ko\-ma\-n\-dakh} co, rcsdiff {\cyr i} rcsmerge
{\cyr po\-da\-vit za\-da\-n\-n\-oe po umo\-l\-cha\-ni\-yu
zna\-che\-n\-ie. Is\-pol{\cprime}\-zu{\u i}\-te} rcs -kv {\cyr s
os\-to\-ro\-zh\-nost{\cprime}\-yu, po\-s\-kol{\cprime}\-ku} -kv {\cyr
ne\-so\-v\-me\-s\-t\-no s} co -l{\cyr . Dlya
vo\-s\-s\-ta\-no\-v\-le\-ni\-ya obychnykh pra\-vil
po\-d\-s\-ta\-no\-v\-ki, is\-pol{\cprime}\-zu{\u i}\-te} rcs -kkv .

-l$[$rev$]$

{\cyr Bro\-ni\-r\-uet dlya pol{\cprime}\-zo\-va\-te\-l\-ya
po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu iz tekh, che{\u i} no\-mer
men{\cprime}\-she ili ra\-ven} rev {\cyr . Es\-li} rev {\cyr za\-d\-aet
no\-mer ve\-t\-vi, to po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu na \`eto{\u
i} ve\-t\-vi iz tekh, che{\u i} no\-mer men{\cprime}\-she ili ra\-ven}
rev {\cyr . Es\-li} rev {\cyr opu\-shchen, to bro\-ni\-r\-uet\-s\-ya
po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu.
Bro\-ni\-ro\-va\-n\-ie ne\-o\-b\-kho\-di\-mo dlya
pre\-do\-t\-v\-ra\-shche\-ni\-ya
na\-k\-la\-d\-y\-va\-yu\-shchi\-kh\-s\-ya drug na dru\-ga
iz\-me\-ne\-ni{\u i} vno\-si\-mykh ra\-z\-n\-y\-mi
pol{\cprime}\-zo\-va\-te\-l\-ya\-mi. Pra\-vi\-lo ot\-me\-ny
bro\-ni\-ro\-va\-ni\-ya, v slu\-ch\-ae, es\-li kto-to
za\-b\-ro\-ni\-ro\-val fa{\u i}l do Vas ta\-k\-oe zhe, kak i v
slu\-ch\-ae} rcs -u ({\cyr sm. ni\-zhe).}

-u$[$rev$]$

{\cyr Ot\-me\-n\-yaet bro\-ni\-ro\-va\-n\-ie ve\-r\-s\-ii} rev {\cyr .
Es\-li za\-da\-na ne ve\-r\-si\-ya a vetv{\cprime}, to
po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii na da\-n\-no{\u i} ve\-t\-vi, a
es\-li} rev {\cyr ot\-sut\-s\-t\-v\-uet, to po\-s\-le\-d\-n\-ee
bro\-ni\-ro\-va\-n\-ie, sde\-la\-n\-n\-oe da\-n\-nym
pol{\cprime}\-zo\-va\-te\-lem. Pri no\-r\-mal{\cprime}\-nykh
ob\-sto\-ya\-tel{\cprime}\-s\-t\-vakh, tol{\cprime}\-ko sam
za\-b\-ro\-ni\-ro\-va\-v\-shi{\u i} ve\-r\-si\-yu ot\-me\-n\-yaet
bro\-ni\-ro\-va\-n\-ie. Es\-li \`eto de\-l\-aet kto-to dru\-go{\u i} iz
ime\-yu\-shchikh na \`eto pra\-vo, to po\-s\-y\-l\-aet\-s\-ya
so\-o\-b\-shche\-n\-ie ob ot\-me\-ne bro\-ni\-ro\-va\-ni\-ya po
\`ele\-k\-t\-ro\-n\-no{\u i} po\-ch\-te. Pri \`etom
ot\-me\-n\-ya\-yu\-shche\-mu pre\-d\-la\-g\-aet\-s\-ya
pri\-lo\-zhit{\cprime} k \`eto\-mu so\-o\-b\-shche\-ni\-yu
ko\-m\-me\-n\-ta\-ri{\u i}, so\-de\-r\-zha\-shchi{\u i} pri\-chi\-ny
ta\-ko\-go po\-s\-tu\-p\-ka. Kak i re\-gi\-s\-t\-ra\-c\-io\-n\-ny{\u i}
ko\-m\-me\-n\-ta\-ri{\u i}, \`eto so\-o\-b\-shche\-n\-ie do\-l\-zh\-no
oka\-n\-chi\-vat{\cprime}\-s\-ya si\-m\-vo\-lom ko\-n\-ca fa{\u i}\-la,
li\-bo stro\-ko{\u i}, so\-de\-r\-zha\-shche{\u i}
edi\-n\-s\-t\-ve\-n\-nu\-yu to\-ch\-ku.}

-L

{\cyr Us\-ta\-na\-v\-li\-v\-aet stro\-gi{\u i} re\-zhim
bro\-ni\-ro\-va\-ni\-ya, chto oz\-na\-ch\-aet
ra\-s\-p\-ro\-s\-t\-ra\-ne\-n\-ie vsekh og\-ra\-ni\-che\-ni{\u i} na
ra\-bo\-tu s fa{\u i}\-lom i na vla\-del{\cprime}\-ca fa{\u i}\-la.
No\-r\-mal{\cprime}\-ny{\u i} re\-zhim do\-s\-tu\-pa k fa{\u i}\-lam
ko\-to\-r\-ye po\-d\-de\-r\-zhi\-va\-yut\-s\-ya gru\-p\-po{\u i}.}

-U

{\cyr Us\-ta\-na\-v\-li\-v\-aet ne\-s\-t\-ro\-gi{\u i} re\-zhim
bro\-ni\-ro\-va\-ni\-ya. Vla\-de\-lec fa{\u i}\-la ne ob\-ya\-zan
bro\-ni\-ro\-vat{\cprime} fa{\u i}l dlya vne\-se\-ni\-ya
po\-s\-le\-du\-yu\-shchikh iz\-me\-ne\-ni{\u i}. Up\-ro\-shch\-aet
ra\-bo\-tu s fa{\u i}\-la\-mi, ko\-to\-r\-ye po\-d\-de\-r\-zhi\-v\-aet
odin che\-lo\-vek. Re\-zhim bro\-ni\-ro\-va\-ni\-ya,
za\-da\-v\-ae\-my{\u i} po umo\-l\-cha\-ni\-yu, za\-d\-aet\-s\-ya
si\-s\-te\-m\-nym ad\-mi\-ni\-s\-t\-ra\-to\-rom, no, kak pra\-vi\-lo,
on stro\-gi{\u i}.}

-mrev:msg

{\cyr Za\-me\-nit{\cprime} re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu
za\-pis{\cprime} dlya ve\-r\-s\-ii} rev {\cyr stro\-ko{\u i}} msg .

-M

{\cyr Ne po\-s\-y\-lat{\cprime} so\-o\-b\-shche\-n\-ie ob ot\-me\-ne
bro\-ni\-ro\-va\-ni\-ya. Pre\-d\-po\-la\-g\-aet\-s\-ya, chto \`etot
flag bu\-dut is\-pol{\cprime}\-zo\-vat{\cprime} tol{\cprime}\-ko
pro\-g\-ra\-m\-my, uve\-do\-m\-l\-ya\-yu\-shch\-ie ob \`etom
dru\-gi\-mi sre\-d\-s\-t\-va\-mi i is\-pol{\cprime}\-zu\-yu\-shch\-ie}
rcs -u {\cyr kak vspo\-mo\-ga\-tel{\cprime}\-nu\-yu ope\-ra\-ci\-yu.}

-nname$[$:$[$rev$]$$]$

{\cyr Svya\-zat{\cprime} si\-m\-vo\-li\-che\-s\-k\-oe im\-ya} na\-me
{\cyr s vetv{\cprime}\-yu ili ve\-r\-s\-ie{\u i}} rev {\cyr .
Uda\-lit{\cprime} si\-m\-vo\-li\-che\-s\-k\-oe im\-ya} na\-me {\cyr ,
es\-li ot\-sut\-s\-t\-vu\-yut i} rev {\cyr i dvo\-e\-to\-ch\-ie; v
inom slu\-ch\-ae, es\-li im\-ya} na\-me {\cyr svya\-za\-no s
dru\-go{\u i} ve\-r\-s\-ie{\u i}, vydat{\cprime} so\-o\-b\-shche\-n\-ie
ob oshi\-b\-ke. Es\-li} rev {\cyr -- si\-m\-vo\-li\-che\-s\-ki{\u i}
no\-mer, to po\-d\-s\-ta\-no\-v\-ka no\-me\-ra v} rev {\cyr
osu\-shche\-s\-t\-v\-l\-yaet\-s\-ya do svya\-z\-y\-va\-ni\-ya} c na\-me
{\cyr . Es\-li} rev {\cyr ya\-v\-l\-yaet\-s\-ya no\-me\-rom ve\-t\-vi,
oka\-n\-chi\-va\-yu\-shchi\-m\-s\-ya to\-ch\-ko{\u i}, to
svya\-z\-y\-v\-aet\-s\-ya po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya
ve\-t\-vi, dvo\-e\-to\-ch\-ie bez no\-me\-ra ve\-r\-s\-ii
oz\-na\-ch\-aet po\-s\-le\-d\-n\-yu\-yu ve\-r\-si\-yu na ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu, ob\-ychno na
gla\-v\-no{\u i}. Na\-p\-ri\-mer,}

rcs -nname: RCS/$\star$

{\cyr svya\-zhet s ime\-nem} na\-me {\cyr po\-s\-le\-d\-n\-ie
ve\-r\-s\-ii vsekh fa{\u i}\-lov ime\-yu\-shchi\-kh\-s\-ya v
ar\-khi\-v\-nom ka\-ta\-lo\-ge. V to\-zhe vre\-m\-ya, ko\-ma\-n\-da}

rcs -nname:\$ RCS/$\star$

{\cyr svya\-zhet s ime\-nem} na\-me {\cyr te ve\-r\-s\-ii fa{\u
i}\-lov, ko\-to\-r\-ye ona op\-re\-de\-lit po ma\-r\-ke\-ram v
ra\-bo\-chikh fa{\u i}\-lakh, a oni ne ob\-ya\-za\-ny byt{\cprime}
po\-s\-le\-d\-ni\-mi ve\-r\-si\-ya\-mi.}

-nname$[$:$[$rev$]$$]$

{\cyr De{\u i}\-stvuet tak zhe, kak i} -n{\cyr , no
be\-zu\-s\-lo\-v\-no ot\-me\-n\-yaet sta\-r\-oe zna\-che\-n\-ie}
na\-me{\cyr , es\-li ta\-ko\-v\-oe bylo za\-da\-no.}

-ora\-n\-ge

{\cyr Uda\-lit{\cprime} iz ar\-khi\-va ve\-r\-s\-ii iz
pro\-me\-zhu\-t\-ka} ra\-n\-ge{\cyr . Es\-li} ra\-n\-ge {\cyr
so\-s\-t\-oit iz od\-no{\u i} ve\-r\-s\-ii, uda\-lit{\cprime} \`etu
ve\-r\-si\-yu, es\-li} ra\-n\-ge {\cyr ya\-v\-l\-yaet\-s\-ya
no\-me\-rom ve\-t\-vi, to uda\-lit{\cprime} po\-s\-le\-d\-n\-yu\-yu
ve\-r\-si\-yu da\-n\-no{\u i} ve\-t\-vi. Es\-li} ra\-n\-ge {\cyr
im\-eet vid} rev1:rev2 {\cyr to uda\-lit{\cprime} vse ve\-r\-s\-ii
na\-chi\-na\-ya s} rev1 {\cyr i ko\-n\-cha\-ya} rev2 {\cyr
vklyu\-chi\-tel{\cprime}\-no, na od\-no{\u i} ve\-t\-viZh :}rev {\cyr
oz\-na\-ch\-aet pro\-me\-zhu\-tok ot na\-cha\-la
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche{\u i} ve\-t\-vi do} rev {\cyr
vklyu\-chi\-tel{\cprime}\-no;} rev: {\cyr oz\-na\-ch\-aet
pro\-me\-zhu\-tok ot} rev {\cyr do ko\-n\-ca
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche{\u i} ve\-t\-vi
vklyu\-chi\-tel{\cprime}\-no. Ni od\-na iz uda\-l\-ya\-e\-mykh
ve\-r\-si{\u i} ne do\-l\-zh\-na byt{\cprime} za\-b\-ro\-ni\-ro\-va\-na
ili slu\-zhit{\cprime} na\-cha\-lom po\-bo\-ch\-no{\u i} ve\-t\-vi.}

-q

{\cyr Ne pe\-cha\-tat{\cprime} ni\-ka\-kikh so\-o\-b\-shche\-ni{\u i}.}

-I

{\cyr Za\-dat{\cprime} di\-a\-lo\-go\-vy{\u i} re\-zhim, da\-zhe es\-li
vvod osu\-shche\-s\-t\-v\-l\-yaet\-s\-ya ne s te\-r\-mi\-na\-la.}

-sstate$[$:rev$]$

{\cyr Pri\-dat{\cprime} ve\-r\-s\-ii} rev {\cyr sta\-tus} state {\cyr .
Es\-li} rev {\cyr za\-d\-aet no\-mer ve\-t\-vi, to po\-s\-le\-d\-ne{\u
i} ve\-r\-s\-ii na \`eto{\u i} ve\-t\-vi iz tekh, che{\u i} no\-mer
men{\cprime}\-she ili ra\-ven} rev {\cyr . Es\-li} rev {\cyr
opu\-shchen, to po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu. V
ka\-che\-s\-t\-ve} state {\cyr mo\-zh\-no
is\-pol{\cprime}\-zo\-vat{\cprime} lyu\-bo{\u i}
ide\-n\-ti\-fi\-ka\-tor. Re\-ko\-me\-n\-du\-yut\-s\-ya k
is\-pol{\cprime}\-zo\-va\-ni\-yu:} Exp ({\cyr
\`ek\-spe\-ri\-me\-n\-tal{\cprime}\-na\-ya),} Stab ({\cyr
sta\-bil{\cprime}\-na\-ya), i} Rel ({\cyr vypusk). Po
umo\-l\-cha\-ni\-yu sta\-tus} Exp.

-t$[$fi\-le$]$

{\cyr Is\-pol{\cprime}\-zo\-vat{\cprime} so\-de\-r\-zhi\-m\-oe fa{\u
i}\-la} fi\-le {\cyr v ka\-che\-s\-t\-ve opi\-sa\-ni\-ya
re\-gi\-s\-t\-ri\-ru\-e\-mo\-go fa{\u i}\-la. Sta\-r\-oe opi\-sa\-n\-ie
za\-ti\-r\-aet\-s\-ya. Og\-ra\-ni\-che\-n\-ie: mi\-nus ne mo\-zhet
byt{\cprime} pe\-r\-vym si\-m\-vo\-lom v ime\-ni} fi\-le{\cyr . Es\-li
im\-ya fa{\u i}\-la ne za\-da\-no, po\-d\-ra\-zu\-me\-v\-aet\-s\-ya
sta\-n\-da\-r\-tny{\u i} vvod, so\-o\-b\-shche\-n\-ie s ko\-to\-ro\-go
do\-l\-zh\-no oka\-n\-chi\-vat{\cprime}\-s\-ya si\-m\-vo\-lom ko\-n\-ca
fa{\u i}\-la, li\-bo stro\-ko{\u i}, so\-de\-r\-zha\-shche{\u i}
edi\-n\-s\-t\-ve\-n\-nu\-yu to\-ch\-ku. Vydaet\-s\-ya
pri\-g\-la\-she\-n\-ie k vvo\-du, es\-li vo\-z\-mo\-zhen di\-a\-log,
sm.} -I{\cyr . Opi\-sa\-n\-ie tre\-b\-uet\-s\-ya pri fla\-ge} -i{\cyr ,
da\-zhe es\-li flag} -t {\cyr ne za\-dan.}

-t-string

{\cyr To zhe, chto i pre\-d\-y\-du\-shchi{\u i} flag, no opi\-sa\-n\-ie
za\-d\-aet\-s\-ya v ko\-ma\-n\-d\-no{\u i} stro\-ke.}

-T

{\cyr So\-kh\-ra\-n\-yaet da\-tu i vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya ra\-bo\-che\-go fa{\u i}\-la da\-zhe es\-li v nem
byli iz\-me\-ne\-ny zna\-che\-ni\-ya klyu\-che\-vykh si\-m\-vo\-lov,
es\-li tol{\cprime}\-ko ne byla uda\-le\-na ve\-r\-si\-ya. Ta\-k\-oe
po\-ve\-de\-n\-ie fla\-ga vvo\-dit v za\-b\-lu\-zh\-de\-ni\-yu
ko\-ma\-n\-du} ma\-ke(1) {\cyr i, po\-to\-mu ne\-o\-b\-kho\-di\-ma
os\-to\-ro\-zh\-nost{\cprime}. Flag} -T {\cyr po\-z\-vo\-l\-yaet
iz\-be\-zhat{\cprime} ne\-nu\-zhnykh po\-s\-t\-ro\-e\-ni{\u i}
(ko\-m\-pi\-l\-ya\-ci{\u i}), no ona mo\-zhet po\-da\-vit{\cprime} ikh
i to\-g\-da, ko\-g\-da iz\-me\-ne\-n\-ie
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rov
su\-shche\-s\-t\-ve\-no dlya re\-zul{\cprime}\-ta\-ta
po\-s\-t\-ro\-e\-ni\-ya.}

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr na
sta\-n\-da\-r\-tny{\u i} vyvod.}

-Vn

{\cyr Imi\-ti\-r\-uet po\-ve\-de\-n\-ie ve\-r\-s\-ii} n {\cyr
ko\-m\-p\-le\-k\-sa pro\-g\-ramm} RCS . {\cyr Sm.} co(1) .

-xsuffixes

{\cyr Za\-d\-aet su\-f\-fiks, do\-ba\-v\-l\-ya\-e\-my{\u i} k ime\-ni
ar\-khi\-v\-no\-go fa{\u i}\-la. Sm.} ci(1) .

-zzone

{\cyr Pri\-sut\-s\-t\-v\-uet is\-klyu\-chi\-tel{\cprime}\-no dlya
so\-v\-me\-s\-ti\-mo\-s\-ti s dru\-gi\-mi ko\-ma\-n\-da\-mi} RCS {\cyr
, dlya ko\-to\-rykh za\-d\-aet fo\-r\-mat da\-ty pri
po\-d\-s\-ta\-no\-v\-ke klyu\-che\-vykh slov v ma\-r\-ke\-ry i
cha\-so\-vo{\u i} po\-yas dlya fla\-ga} -ddate .

{\cyr Dlya so\-v\-me\-s\-ti\-mo\-s\-ti s bu\-du\-shchi\-mi
ve\-r\-si\-ya\-mi tre\-b\-uet\-s\-ya ya\-v\-n\-oe za\-da\-n\-ie
kho\-t\-ya by od\-no\-go fla\-ga.

SO\-V\-ME\-S\-TI\-MOST{\cprime}

Flag} -brev {\cyr po\-ro\-zh\-d\-aet ar\-khi\-v\-n\-ye fa{\u i}\-ly,
ko\-to\-r\-ye ne mo\-gut byt{\cprime} pra\-vil{\cprime}\-no
vo\-s\-p\-ri\-n\-ya\-ty si\-s\-te\-mo{\u i}} RCS {\cyr ve\-r\-s\-ii 3
ili bo\-l\-ee ra\-n\-ne{\u i}.

Flag} -ksubst ({\cyr kro\-me} -kkv{\cyr ) po\-ro\-zh\-d\-aet
ar\-khi\-v\-n\-ye fa{\u i}\-ly, ko\-to\-r\-ye ne mo\-gut byt{\cprime}
pra\-vil{\cprime}\-no vo\-s\-p\-ri\-n\-ya\-ty si\-s\-te\-mo{\u i}} RCS
{\cyr ve\-r\-s\-ii 4 ili bo\-l\-ee ra\-n\-ne{\u i}.

Dlya to\-go, chto\-by pri\-ve\-s\-ti ar\-khiv v vid, ko\-to\-ry{\u i}
mo\-zhet byt{\cprime} pra\-vil{\cprime}\-no vo\-s\-p\-ri\-n\-ya\-ty
si\-s\-te\-mo{\u i}} RCS {\cyr ve\-r\-s\-ii} n {\cyr , pri\-me\-ni\-te
ko\-ma\-n\-du} rcs -Vn .

{\cyr Si\-s\-te\-ma} RCS {\cyr do ve\-r\-s\-ii 5.5 ne
po\-d\-de\-r\-zhi\-va\-la flag} -x {\cyr i tre\-bo\-va\-la su\-f\-fiks
,}v .

{\cyr FA{\u I}\-LY

Ko\-ma\-n\-da} rcs {\cyr ra\-bo\-t\-aet s fa{\u i}\-la\-mi tak zhe, kak
ko\-ma\-n\-da} ci(1) , {\cyr no is\-pol{\cprime}\-z\-uet pra\-va
do\-s\-tu\-pa lo\-gi\-che\-s\-ko\-go (}ef\-fe\-c\-ti\-ve) {\cyr
pol{\cprime}\-zo\-va\-te\-l\-ya, t.e. pra\-va
pol{\cprime}\-zo\-va\-te\-l\-ya, vyzva\-v\-she\-go \`etu ko\-ma\-n\-du.
Kro\-me to\-go, e{\u i} ne tre\-b\-uet\-s\-ya pra\-vo na
iz\-me\-ne\-n\-ie ra\-bo\-che\-go fa{\u i}\-la, bo\-l\-ee to\-go, ona
ot\-kryvaet ra\-bo\-chi{\u i} fa{\u i}l dlya chte\-ni\-ya,
tol{\cprime}\-ko v slu\-ch\-ae, ko\-g\-da no\-mer ve\-r\-s\-ii za\-dan
kak \$ .

PE\-RE\-ME\-N\-N\-YE SRE\-DY}

LO\-G\-NA\-ME

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya. V} UNIX {\cyr za\-da\-no
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}}

set LO\-G\-NA\-ME={\cyr im\-ya-pol{\cprime}\-zo\-va\-te\-l\-ya}

TZ

{\cyr Cha\-so\-vo{\u i} po\-yas. V} UNIX {\cyr za\-dan
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}} set.

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Sm.} ci(1) .

{\cyr SO\-O\-B\-SHCHE\-NI\-Ya

Pe\-cha\-t\-aet im\-ya ar\-khi\-v\-no\-go fa{\u i}\-la, i no\-me\-ra
uda\-l\-ya\-e\-mo{\u i} ve\-r\-s\-ii. Vo\-z\-v\-ra\-shch\-aet
ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0 to\-g\-da i
tol{\cprime}\-ko to\-g\-da, ko\-g\-da vse ope\-ra\-c\-ii
za\-ve\-r\-shi\-lis{\cprime} us\-pe\-sh\-no.

SM. TA\-K\-ZHE}

rcsintro(1), co(1), ci(1), rcsfile(5),

ident(1), rcsclean(1), rcsdiff(1), rcsmerge(1), rlog(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


{\cyr PRO\-B\-LE\-MY

Pri si\-s\-te\-m\-nom sboe, na\-p\-ri\-mer vyzva\-v\-shem
pe\-re\-za\-pusk, mo\-gut os\-ta\-vat{\cprime}\-s\-ya
si\-g\-nal{\cprime}\-n\-ye fa{\u i}\-ly (sm.} ci(1) {\cyr
VRE\-ME\-N\-N\-YE FA{\u I}\-LY I LI\-N\-KI), ko\-to\-r\-ye
so\-de\-r\-zhat in\-fo\-r\-ma\-ci\-yu o tom, chto v da\-n\-n\-oe
vre\-m\-ya idet ra\-bo\-ta s ar\-khi\-v\-nym fa{\u i}\-lom, chto ne
dast ego iz\-me\-nit{\cprime}. Po\-lo\-zhe\-n\-ie le\-g\-ko
is\-pra\-vit{\cprime}, uda\-liv si\-g\-nal{\cprime}\-n\-ye fa{\u
i}\-ly, ime\-na ko\-to\-rykh ob\-ychno ili na\-chi\-na\-yut\-s\-ya s
za\-p\-ya\-to{\u i}, ili za\-ka\-n\-chi\-va\-yut\-s\-ya na si\-m\-vol
po\-d\-che\-r\-ki\-va\-ni\-ya.

Iz-za so\-v\-me\-s\-ti\-mo\-s\-ti s pre\-d\-y\-du\-shchi\-mi
ve\-r\-si\-ya\-mi} RCS {\cyr , v ko\-to\-rykh v ka\-che\-s\-t\-ve
ra\-z\-de\-li\-te\-l\-ya is\-pol{\cprime}\-zo\-va\-l\-s\-ya mi\-nus
vme\-s\-to dvo\-e\-to\-chi\-ya, vo\-z\-ni\-ka\-yut pro\-b\-le\-my s
si\-m\-vo\-li\-che\-s\-ki\-mi no\-me\-ra\-mi ve\-r\-si{\u i},
na\-chi\-na\-yu\-shchi\-mi\-s\-ya s mi\-nu\-sa. Ko\-ma\-n\-da} rcs -o
{\cyr vo\-s\-p\-ri\-met mi\-nus kak ra\-z\-de\-li\-tel{\cprime}, no
so\-o\-b\-shchit o ne\-u\-da\-ch\-nom vybo\-re
si\-m\-vo\-li\-che\-s\-ko\-go ime\-ni.

Si\-m\-vo\-li\-che\-s\-k\-ie ime\-na ne ob\-ya\-za\-ny
uka\-z\-y\-vat{\cprime} na khra\-n\-ya\-shchi\-e\-s\-ya v ar\-khi\-ve
ve\-r\-s\-ii. Flag} -o {\cyr ne uda\-lit si\-m\-vo\-li\-che\-s\-k\-ie
ime\-na, ssyla\-yu\-shchi\-e\-s\-ya na uda\-le\-n\-nu\-yu
ve\-r\-si\-yu, i nu\-zh\-no is\-pol{\cprime}\-zo\-vat{\cprime} flag} -n
{\cyr dlya uda\-le\-ni\-ya si\-m\-vo\-li\-che\-s\-ko\-go ime\-ni
ve\-r\-s\-ii v ya\-v\-nom vi\-de.}

\chapter{RCSFILE(5)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rcsfile - {\cyr fo\-r\-mat ar\-khi\-v\-no\-go fa{\u i}\-la v
Si\-s\-te\-me Ot\-s\-le\-zhi\-va\-ni\-ya Ve\-r\-si{\u i}} RCS .

{\cyr OPI\-SA\-N\-IE

Tekst, po\-me\-shche\-n\-ny{\u i} v ar\-khiv mo\-zhet imet{\cprime}
svo\-bo\-d\-ny{\u i} fo\-r\-mat, no sam ar\-khi\-v\-ny{\u i} fa{\u i}l
ob\-ya\-zan za\-ka\-n\-chi\-vat{\cprime}\-s\-ya si\-m\-vo\-lom
no\-vo{\u i} stro\-ki. Ra\-z\-de\-li\-te\-li -- si\-m\-vo\-ly
pro\-be\-la, za\-bo\-ya, ta\-bu\-l\-ya\-c\-ii, no\-vo{\u i} stro\-ki,
ve\-r\-ti\-kal{\cprime}\-no{\u i} ta\-bu\-l\-ya\-c\-ii, sme\-ny
stra\-ni\-cy, i vo\-z\-v\-ra\-ta ka\-re\-t\-ki -- ime\-yut oso\-b\-oe
zna\-che\-n\-ie tol{\cprime}\-ko v spe\-c\-ial{\cprime}\-nykh
stro\-kakh i ne mo\-gut po\-ya\-v\-l\-yat{\cprime}\-s\-ya vnu\-t\-ri
sle\-du\-yu\-shchikh \`ele\-me\-n\-tov:} id, num {\cyr i} sym.

{\cyr Spe\-c\-ial{\cprime}\-n\-ye stro\-ki og\-ra\-ni\-che\-ny s
ob\-eikh sto\-ron si\-m\-vo\-la\-mi} @. {\cyr Es\-li
ar\-khi\-vi\-ru\-e\-ma\-ya ili spe\-c\-ial{\cprime}\-na\-ya stro\-ka
sa\-ma so\-de\-r\-zhit} @{\cyr , to \`etot si\-m\-vol
ud\-va\-i\-v\-aet\-s\-ya. Spe\-c\-ial{\cprime}\-na\-ya stro\-ka
mo\-zhet so\-de\-r\-zhat{\cprime} lyu\-b\-ye si\-m\-vo\-ly.

Me\-ta-si\-n\-ta\-k\-sis fo\-r\-mul, is\-pol{\cprime}\-zo\-va\-n\-ny{\u
i} ni\-zhe, pri\-de\-r\-zhi\-v\-aet\-s\-ya sle\-du\-yu\-shchikh
so\-g\-la\-she\-ni{\u i}: Si\-m\-vol `$\mid$' ra\-z\-de\-l\-yaet dva
\`ele\-me\-n\-ta, iz ko\-to\-rykh nu\-zh\-no vybrat{\cprime} odin.
Si\-m\-vo\-ly `$\lbrace$' i `$\rbrace$' og\-ra\-ni\-chi\-va\-yut
ne\-o\-b\-ya\-za\-tel{\cprime}\-ny{\u i} \`ele\-ment. Si\-m\-vo\-ly
`$\lbrace$' i `$\rbrace$$\star$' og\-ra\-ni\-chi\-va\-yut \`ele\-ment,
ko\-to\-ry{\u i} mo\-zhet byt{\cprime} po\-v\-to\-ren nol{\cprime} ili
bo\-l\-ee raz. Si\-m\-vol `$\lbrace$'} and '$\rbrace$+' {\cyr
og\-ra\-ni\-chi\-va\-yut \`ele\-ment, ko\-to\-ry{\u i} do\-l\-zhen
byt{\cprime} po\-v\-to\-ren odin ili bo\-l\-ee raz.}

{\cyr Dlya ide\-n\-ti\-fi\-ka\-to\-rov im\-eet zna\-che\-n\-ie,
pro\-pi\-s\-na\-ya bu\-k\-va ili stro\-ch\-na\-ya. Vse klyu\-che\-v\-ye
slo\-va na\-b\-ra\-ny v ni\-zh\-nem re\-gi\-s\-t\-re.
Mno\-zhe\-s\-t\-va ide\-n\-ti\-fi\-ka\-to\-rov i klyu\-che\-vykh slov
mo\-gut pe\-re\-se\-kat{\cprime}\-s\-ya. Dlya
bol{\cprime}\-shi\-n\-s\-t\-va ope\-ra\-c\-io\-n\-nykh si\-s\-tem v}
RCS {\cyr is\-pol{\cprime}\-z\-uet\-s\-ya sta\-n\-dart} ISO 8859/1
{\cyr , gde pe\-cha\-ta\-e\-m\-y\-mi si\-m\-vo\-la\-mi
schi\-ta\-yut\-s\-ya ko\-dy 041-176 i 240-377 v
vos{\cprime}\-me\-ri\-ch\-no{\u i} za\-pi\-si, a pro\-be\-la\-mi --
010-015 i 040 (chto so\-g\-la\-s\-uet\-s\-ya s KOI-8 i
ko\-di\-ro\-v\-ka\-mi} IBM {\cyr dlya} OS2 {\cyr i} MS-Wi\-n\-dows
$[$co\-de pa\-ge 2041$]$ {\cyr i} Ma\-c\-ki\-n\-tosh {\cyr dlya
sla\-v\-ya\-n\-s\-kikh ya\-z\-y\-kov, no sta\-n\-da\-r\-t\-na\-ya i
al{\cprime}\-te\-r\-na\-ti\-v\-na\-ya} $[$co\-de pa\-ge 866$]$ {\cyr
ko\-di\-ro\-v\-ki dlya} MS-DOS {\cyr pri\-vo\-d\-yat k dvo\-i\-chnym
fa{\u i}\-lam).

Da\-ty po\-s\-le klyu\-che\-vo\-go slo\-va} date {\cyr ime\-yut vid}
Y.mm.dd.hh.mm.ss, {\cyr gde} Y {\cyr -- god,} mm {\cyr -- me\-s\-yac
(01-12),} dd {\cyr den{\cprime} -- (01-31),} hh {\cyr -- chas (00-23),}
mm {\cyr -- mi\-nu\-ta (00-59), i} ss {\cyr se\-ku\-n\-da (00-60). Dlya
obo\-z\-na\-che\-ni\-ya dat s 1900 po 1999} Y {\cyr
pre\-d\-s\-ta\-v\-l\-yaet so\-bo{\u i} dve po\-s\-le\-d\-n\-ie
ci\-f\-ry go\-da; sle\-du\-yu\-shch\-ie go\-da bu\-dut
obo\-z\-na\-chat{\cprime}\-s\-ya che\-tyr{\cprime}\-m\-ya
ci\-f\-ra\-mi. Vo vnu\-t\-re\-n\-nem fo\-r\-ma\-te fa{\u i}\-la
is\-pol{\cprime}\-zu\-yut\-s\-ya Gri\-go\-ri\-a\-n\-s\-ki{\u i}
Ka\-le\-n\-dar{\cprime} i Vse\-mi\-r\-n\-oe Vre\-m\-ya.

Ko\-n\-s\-t\-ru\-k\-ci\-ya} ne\-w\-p\-h\-ra\-se {\cyr
za\-re\-ze\-r\-vi\-ro\-va\-na dlya dal{\cprime}\-ne{\u i}\-she\-go
ra\-s\-shi\-re\-ni\-ya fo\-r\-ma\-ta si\-s\-te\-my} RCS{\cyr .
Ga\-ra\-n\-ti\-r\-uet\-s\-ya, chto} ne\-w\-p\-h\-ra\-se {\cyr ne
bu\-det na\-chi\-nat{\cprime}\-s\-ya s is\-pol{\cprime}\-z\-ue\-mykh v
na\-s\-to\-ya\-shch\-ee vre\-m\-ya klyu\-che\-vykh slov.

Ve\-r\-shi\-ny, so\-o\-t\-vet\-s\-t\-vu\-yu\-shch\-ie} de\-l\-ta {\cyr
ob\-ra\-zu\-yut de\-re\-vo. Ve\-r\-shi\-ny s no\-me\-ra\-mi iz dvukh
chi\-sel (napr., 2.3, 2.1, 1.3, i t.p.) ob\-ra\-zu\-yut gla\-v\-nu\-yu
vetv{\cprime}, i za\-da\-ny ob\-ra\-t\-n\-y\-mi
pri\-ra\-shche\-ni\-ya\-mi te\-k\-s\-ta v ub\-yva\-yu\-shchem
po\-r\-ya\-d\-ke ve\-r\-si{\u i}, na\-chi\-na\-ya s po\-s\-le\-d\-ne{\u
i} ve\-r\-s\-ii gla\-v\-no{\u i} ve\-t\-vi, za\-pi\-sa\-n\-no{\u i} v
ar\-khiv ce\-li\-kom. Po\-le} head {\cyr v blo\-ke} ad\-min {\cyr
uka\-z\-y\-v\-aet na ve\-r\-shi\-nu \`eto{\u i} ce\-po\-ch\-ki, t.e. na
po\-s\-le\-d\-n\-yu\-yu v le\-k\-si\-ko\-g\-ra\-fi\-che\-s\-kom smysle
pa\-ru. Po\-le} branch {\cyr v blo\-ke} ad\-min {\cyr uka\-z\-y\-v\-aet
na vetv{\cprime} (ili ve\-r\-si\-yu) is\-pol{\cprime}\-zu\-e\-mu\-yu po
umo\-l\-cha\-ni\-yu. Es\-li \`eto po\-le pu\-s\-to, to
is\-pol{\cprime}\-z\-uet\-s\-ya po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya
na gla\-v\-no{\u i} ve\-t\-vi (sta\-r\-sha\-ya vetv{\cprime},
vykho\-d\-ya\-shcha\-ya iz po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii).

Ve\-r\-shi\-ny} de\-l\-ta{\cyr , ch{\cprime}i no\-me\-ra za\-da\-ny 2}n
{\cyr chi\-s\-la\-mi (}n$>$=2) ({\cyr napr., 3.1.1.1, 2.1.2.2, i t.p.)
svya\-za\-ny sle\-du\-yu\-shchim ob\-ra\-zom. Ve\-r\-shi\-ny s
odi\-na\-ko\-v\-y\-mi 2}n-1 {\cyr pe\-r\-v\-y\-mi no\-me\-ra\-mi,
upo\-r\-ya\-do\-che\-ny po po\-s\-le\-d\-ne\-mu po\-l\-yu v
vo\-z\-ra\-s\-ta\-yu\-shchem po\-r\-ya\-d\-ke i za\-da\-ny
prya\-m\-y\-mi pri\-ra\-shche\-ni\-ya\-mi, na\-chi\-na\-ya s
os\-no\-va\-ni\-ya po\-bo\-ch\-no{\u i} ve\-t\-vi -- to\-ch\-ke
ve\-t\-v\-le\-ni\-ya, za\-da\-n\-no{\u i} 2}n-2 {\cyr chi\-s\-la\-mi,
ob\-shchi\-mi dlya po\-bo\-ch\-no{\u i} ve\-t\-vi. Ve\-r\-shi\-na
so\-o\-t\-vet\-s\-t\-vu\-yu\-shcha\-ya to\-ch\-ke ve\-t\-v\-le\-ni\-ya
so\-de\-r\-zhit upo\-r\-ya\-do\-che\-n\-ny{\u i} po
vo\-z\-ra\-s\-ta\-ni\-yu spi\-sok na\-chal{\cprime}\-nykh ve\-r\-shin
vsekh po\-bo\-chnykh ve\-t\-ve{\u i}, vykho\-d\-ya\-shchikh iz nee.}

~

\begin{tabular}{lcl}
rcstext & ::= & admin $\lbrace$delta$\rbrace$$\star$ desc 
$\lbrace$deltatext$\rbrace$$\star$\\
\\
admin & ::= & head $\lbrace$num$\rbrace$;\\
&& $\lbrace$ branch $\lbrace$num$\rbrace$; $\rbrace$\\
&& access $\lbrace$id$\rbrace$$\star$;\\
&& symbols $\lbrace$sym : num$\rbrace$$\star$;\\
&& locks $\lbrace$id : num$\rbrace$$\star$; $\lbrace$strict ;$\rbrace$\\
&& $\lbrace$ comment $\lbrace$string$\rbrace$; $\rbrace$\\
&& $\lbrace$ expand $\lbrace$string$\rbrace$; $\rbrace$\\
&& $\lbrace$ newphrase $\rbrace$$\star$\\
\\
delta & ::= & num\\
&& date num;\\
&& author id;\\
&& state $\lbrace$id$\rbrace$;\\
&& branches $\lbrace$num$\rbrace$$\star$;\\
&& next $\lbrace$num$\rbrace$;\\
&& $\lbrace$ newphrase $\rbrace$$\star$\\
\\
desc & ::= & desc string\\
\\
deltatext & ::= & num\\
&& log string\\
&& $\lbrace$ newphrase $\rbrace$$\star$\\
&& text string\\
\\
num & ::= & $\lbrace$digit $\mid$ .$\rbrace$+\\
\\
digit & ::= & 0 $\mid$ 1 $\mid$ 2 $\mid$ 3 $\mid$ 4 $\mid$ 5 $\mid$ 6 $\mid$ 7 $\mid$ 8 $\mid$ 9\\
\\
id & ::= & $\lbrace$num$\rbrace$ idchar $\lbrace$idchar $\mid$ num$\rbrace$$\star$\\
\\
sym & ::= & $\lbrace$digit$\rbrace$$\star$ idchar $\lbrace$idchar $\mid$ digit$\rbrace$$\star$\\
\\
idchar & ::= & {\cyr lyubo{\u i} pechataemy{\u i} simvol, krome} special\\
\\
special & ::= & \$ $\mid$ , $\mid$ . $\mid$ : $\mid$ ; $\mid$ @\\
\\
string & ::= & @$\lbrace${\cyr lyubo{\u i} simvol, no} @ {\cyr udvaivayutsya$\rbrace$$\star$}@\\
\\
newphrase & ::= & id word$\star$ ;\\
\\
word & ::= & id $\mid$ num $\mid$ string $\mid$ :
\end{tabular}

~\pagebreak[4]

{\cyr Sle\-du\-yu\-shcha\-ya di\-a\-g\-ra\-m\-ma
de\-mo\-n\-s\-t\-ri\-r\-uet or\-ga\-ni\-za\-ci\-yu in\-fo\-r\-ma\-c\-ii
v ar\-khi\-ve.}

\begin{picture}(330,340)
\put(165,270){\oval(60,60)}
\put(155,320){Head}
\put(155,040){1.1}
\put(155,120){1.2}
\put(010,170){1.2.1.1}
\put(010,250){1.2.1.3}
\put(210,170){1.2.2.1}
\put(210,250){1.2.2.2}
\put(280,250){1.2.2.1.1.1}
\put(155,200){1.3}
\put(080,250){1.3.1.1}
\put(155,270){2.1}
\put(100,190){\vector(0,1){50}}
\put(030,110){\vector(0,1){50}}
\put(030,220){\vector(0,1){20}}
\put(150,110){\vector(-1,0){120}}
\put(150,190){\vector(-1,0){50}}
\put(165,080){\vector(0,-1){20}}
\put(165,160){\vector(0,-1){20}}
\put(165,240){\vector(0,-1){20}}
\put(165,320){\vector(0,-1){20}}
\put(180,110){\vector(1,0){50}}
\put(230,110){\vector(0,1){50}}
\put(230,220){\vector(0,1){20}}
\put(245,190){\vector(1,0){65}}
\put(310,190){\vector(0,1){50}}
\put(000,160){\line(1,0){60}}
\put(000,160){\line(1,2){30}}
\put(000,240){\line(1,0){60}}
\put(000,240){\line(1,2){30}}
\put(060,160){\line(-1,2){30}}
\put(060,240){\line(-1,2){30}}
\put(070,240){\line(1,0){60}}
\put(070,240){\line(1,2){30}}
\put(130,240){\line(-1,2){30}}
\put(135,060){\line(1,-2){30}}
\put(135,060){\line(1,0){60}}
\put(135,140){\line(1,-2){30}}
\put(135,140){\line(1,0){60}}
\put(135,220){\line(1,-2){30}}
\put(135,220){\line(1,0){60}}
\put(195,060){\line(-1,-2){30}}
\put(195,140){\line(-1,-2){30}}
\put(195,220){\line(-1,-2){30}}
\put(200,160){\line(1,0){60}}
\put(200,160){\line(1,2){30}}
\put(200,240){\line(1,0){60}}
\put(200,240){\line(1,2){30}}
\put(260,160){\line(-1,2){30}}
\put(260,240){\line(-1,2){30}}
\put(270,240){\line(1,0){80}}
\put(270,240){\line(1,2){40}}
\put(350,240){\line(-1,2){40}}
\end{picture}

{\cyr SM. TA\-K\-ZHE}

rcsintro(1), ci(1), co(1), rcs(1),

ident(1), rcsclean(1), rcsdiff(1), rcsmerge(1), rlog(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

\chapter{RCSMERGE(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rcsmerge - {\cyr ob{\cdprime}edi\-ne\-n\-ie iz\-me\-ne\-ni{\u i},
sde\-la\-n\-nykh v ra\-z\-nykh ve\-r\-si\-yakh fa{\u i}\-la v
si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

rcsmerge $[${\cyr fla\-gi$]$ im\-ya-fa{\u i}\-la ...

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} rcsmerge {\cyr pro\-i\-z\-vo\-dit
ob{\cdprime}edi\-ne\-n\-ie iz\-me\-ne\-ni{\u i}, sde\-la\-n\-nykh s
ra\-z\-n\-y\-mi ve\-r\-si\-ya\-mi od\-no\-go fa{\u i}\-la i
po\-me\-shch\-aet ikh v no\-vy{\u i} ra\-bo\-chi{\u i} fa{\u i}l. S
fo\-r\-mal{\cprime}\-no{\u i} to\-ch\-ki zre\-ni\-ya, nad ra\-bo\-chim
fa{\u i}\-lom so\-ve\-r\-sha\-yut\-s\-ya iz\-me\-ne\-ni\-ya,
ve\-du\-shch\-ie ot pe\-r\-vo{\u i} uka\-za\-n\-no{\u i} v
ko\-ma\-n\-d\-no{\u i} stro\-ke ve\-r\-s\-ii ko vto\-ro{\u i} (sm.
flag} -j {\cyr ko\-ma\-n\-dy} co ).

{\cyr Po\-l\-n\-oe im\-ya fa{\u i}\-la, so\-de\-r\-zha\-shch\-ee
ar\-khi\-v\-ny{\u i} su\-f\-fiks, so\-o\-t\-vet\-s\-t\-v\-uet
ar\-khi\-v\-no\-mu fa{\u i}\-lu, vse pro\-ch\-ie schi\-ta\-yut\-s\-ya
ra\-bo\-chi\-mi fa{\u i}\-la\-mi. O so\-o\-t\-vet\-s\-t\-v\-ii imen
fa{\u i}\-lov, sm.} ci(1) .

{\cyr Do\-l\-zhny byt{\cprime} ya\-v\-no za\-da\-ny od\-na ili dve
ve\-r\-s\-ii s od\-nim iz opi\-sa\-n\-nykh ni\-zhe fla\-gov,
ob\-ychno,} -r {\cyr . Es\-li za\-da\-na od\-na ve\-r\-si\-ya, to v
ka\-che\-s\-t\-ve vto\-ro{\u i} be\-ret\-s\-ya po\-s\-le\-d\-n\-ya\-ya
vetv{\cprime} na ve\-t\-vi, za\-da\-n\-no{\u i} po umo\-l\-cha\-ni\-yu
(ob\-ychno -- gla\-v\-no{\u i}). Ve\-r\-si\-ya mo\-zhet byt{\cprime}
za\-da\-na v ya\-v\-nom vi\-de, chi\-s\-le\-n\-no, ili v
si\-m\-vol{\cprime}\-nom vi\-de.

Ko\-ma\-n\-da} rcsmerge {\cyr so\-o\-b\-shchaet o na\-lo\-zhe\-n\-ii
iz\-me\-ne\-ni{\u i}, sde\-la\-n\-nykh s od\-ni\-mi stro\-ka\-mi,
ra\-z\-de\-l\-ya\-ya na\-k\-la\-d\-y\-va\-yu\-shchi\-e\-s\-ya
ucha\-s\-t\-ki, kak ob{\cdprime}ya\-s\-ne\-no v} me\-r\-ge(1) .

{\cyr FLA\-GI}

-A

{\cyr Es\-li ko\-ma\-n\-da} diff3(1) {\cyr na va\-shem
komp{\cprime}\-yu\-te\-re po\-d\-de\-r\-zhi\-v\-aet flag} -A {\cyr , to
so\-o\-b\-shche\-ni\-ya vyda\-yut\-s\-ya ime\-n\-no v \`etom sti\-le. V
ito\-ge, pri\-me\-ne\-n\-ie iz\-me\-ne\-ni{\u i} ve\-du\-shchikh ot
pe\-r\-vo{\u i} ve\-r\-s\-ii ko vto\-ro{\u i}, k ra\-bo\-che\-mu fa{\u
i}\-lu, po\-ro\-zh\-da\-ya pri \`etom sa\-mu\-yu po\-d\-ro\-b\-nu\-yu
in\-fo\-r\-ma\-ci\-yu. Uti\-li\-ta} diff3 {\cyr iz
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go pa\-ke\-ta} GNU {\cyr \`etot
flag po\-d\-de\-r\-zhi\-v\-aet, po\`eto\-mu im\-eet smysl
uka\-zat{\cprime} pri po\-s\-t\-ro\-e\-n\-ii} RCS {\cyr na va\-shem
komp{\cprime}\-yu\-te\-re, chto is\-pol{\cprime}\-z\-uet\-s\-ya
ime\-n\-no \`eta ve\-r\-si\-ya uti\-li\-ty.}

-E, -e

{\cyr \`Eti fla\-gi za\-da\-yut stil{\cprime} so\-o\-b\-shche\-ni{\u i}
o na\-lo\-zhe\-n\-ii iz\-me\-ne\-ni{\u i}, me\-n\-ee
po\-d\-ro\-b\-ny{\u i}, chem} -A{\cyr . Sm.} diff3(1) {\cyr . Po
umo\-l\-cha\-ni\-yu is\-pol{\cprime}\-z\-uet\-s\-ya} -E{\cyr . Flag} -e
{\cyr ne po\-ro\-zh\-d\-aet ni\-ka\-kikh pre\-du\-p\-re\-zh\-de\-ni{\u
i}.}

-ksubst

{\cyr Us\-ta\-na\-v\-li\-v\-aet pra\-vi\-la po\-d\-s\-ta\-no\-v\-ki
klyu\-che\-vykh si\-m\-vo\-lov pri iz\-vle\-che\-n\-ii dlya
sra\-v\-ne\-ni\-ya. Vo\-z\-mo\-zh\-n\-ye pra\-vi\-la} subst {\cyr
opi\-sa\-ny v} co(1){\cyr . Ya\-v\-n\-oe za\-da\-n\-ie fla\-ga} -k
{\cyr po\-da\-vit za\-da\-n\-n\-oe po umo\-l\-cha\-ni\-yu
zna\-che\-n\-ie. Na\-p\-ri\-mer,} -kk -r1.1 -r1.2 {\cyr
ig\-no\-ri\-r\-uet ra\-z\-ni\-cu svya\-za\-n\-nu\-yu s ra\-z\-n\-y\-mi
zna\-che\-ni\-ya\-mi klyu\-che\-vykh si\-m\-vo\-lov v ve\-r\-si\-yakh
1.1} to 1.2{\cyr . Es\-li za\-dan flag} -kb {\cyr , ko\-ma\-n\-da}
rcsmerge {\cyr ne bu\-det ra\-bo\-tat{\cprime}.}

-p$[$rev$]$

{\cyr Re\-zul{\cprime}\-tat za\-pi\-s\-y\-v\-aet\-s\-ya ne v
ra\-bo\-chi{\u i} fa{\u i}l, a v sta\-n\-da\-r\-tny{\u i} vyvod.}

-q$[$rev$]$

{\cyr Vse so\-o\-b\-shche\-ni\-ya po\-da\-v\-l\-ya\-yut\-s\-ya.
Is\-pol{\cprime}\-z\-uet\-s\-ya v fo\-no\-vom re\-zhi\-me.}

-r$[$rev$]$

{\cyr Iz\-me\-ne\-ni\-ya ot\-s\-chi\-t\-y\-vat{\cprime} ot
ve\-r\-s\-ii} rev {\cyr . Es\-li} rev {\cyr ne za\-dan, to
be\-ret\-s\-ya po\-s\-le\-d\-n\-ya\-ya ve\-r\-si\-ya ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu.}

-T

{\cyr Pri\-sut\-s\-t\-v\-uet is\-klyu\-chi\-tel{\cprime}\-no dlya
so\-v\-me\-s\-ti\-mo\-s\-ti s dru\-gi\-mi ko\-ma\-n\-da\-mi} RCS.

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr na
sta\-n\-da\-r\-tny{\u i} vyvod.}

-Vn

{\cyr Imi\-ti\-r\-uet po\-ve\-de\-n\-ie ve\-r\-s\-ii} n {\cyr
ko\-m\-p\-le\-k\-sa pro\-g\-ramm} RCS . {\cyr Sm.} co(1) .

-xsuffixes

{\cyr Za\-d\-aet su\-f\-fiks, do\-ba\-v\-l\-ya\-e\-my{\u i} k ime\-ni
ar\-khi\-v\-no\-go fa{\u i}\-la. Sm.} ci(1) .

-zzone

{\cyr Za\-d\-aet fo\-r\-mat da\-ty i cha\-so\-vo{\u i} po\-yas pri
po\-d\-s\-ta\-no\-v\-ke klyu\-che\-vykh slov v ma\-r\-ke\-ry. Sm.}
co(1) .

{\cyr PRI\-ME\-RY

Pre\-d\-po\-lo\-zhim, pre\-d\-y\-du\-shchi{\u i} vypusk
pro\-g\-ra\-m\-my za\-da\-va\-l\-s\-ya ve\-r\-s\-ie{\u i} 2.8 fa{\u
i}\-la} f.c {\cyr . Pre\-d\-po\-lo\-zhim da\-l\-ee, chto so\-z\-dav
ve\-r\-si\-yu 3.4 , Vy po\-lu\-cha\-e\-te so\-o\-b\-shche\-n\-ie ob
oshi\-b\-ke so\-de\-r\-zha\-shche{\u i}\-sya v pro\-g\-ra\-m\-me, i
is\-pra\-v\-le\-ni\-ya, vne\-se\-n\-n\-ye v ve\-r\-si\-yu 2.8 ot
tret{\cprime}\-e\-go li\-ca. Dlya to\-go, chto\-by so\-b\-rat{\cprime}
is\-pra\-v\-le\-ni\-ya k ve\-r\-s\-ii 2.8 i te iz\-me\-ne\-ni\-ya,
ko\-to\-r\-ye Vy sde\-la\-li me\-zh\-du ve\-r\-si\-ya\-mi 2.8 i 3.4 ,
po\-me\-s\-ti\-te is\-pra\-v\-le\-n\-nu\-yu ve\-si\-yu 2.8 v fa{\u i}l}
f.c {\cyr vypo\-l\-ni\-te}

rcsmerge -p -r2.8 -r3.4 f.c $>$ f.me\-r\-ged.c

{\cyr i pro\-ver{\cprime}\-te fa{\u i}l} f.me\-r\-ged.c {\cyr .
Dru\-go{\u i} spo\-sob ob{\cdprime}edi\-ne\-ni\-ya iz\-me\-ne\-ni{\u i}
so\-s\-t\-oit v tom, chto\-by za\-ne\-s\-ti is\-pra\-v\-le\-ni\-ya k
ve\-r\-s\-ii 2.8 v ar\-khi\-v\-ny{\u i} fa{\u i}l kak ve\-r\-si\-yu
2.8.1.1 i pri\-me\-nit{\cprime}} co -j :

ci -r2.8.1.1 f.c

co -r3.4 -j2.8:2.8.1.1 f.c

{\cyr V sle\-du\-yu\-shchem pri\-me\-re v ra\-bo\-chem fa{\u i}\-le}
f.c {\cyr , ska\-zhem, ve\-r\-s\-ii 3.4 , ot\-me\-n\-ya\-yut\-s\-ya vse
iz\-me\-ne\-ni\-ya sde\-la\-n\-n\-ye me\-zh\-du ve\-r\-si\-ya\-mi 2.4 i
2.8 \`eto\-go fa{\u i}\-la:}

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

{\cyr Ob\-ra\-ti\-te vni\-ma\-n\-ie na po\-r\-ya\-dok
ar\-gu\-me\-n\-tov i na to, chto ra\-bo\-chi{\u i} fa{\u i}l
za\-t\-ret\-s\-ya.

PE\-RE\-ME\-N\-N\-YE SRE\-DY}

LO\-G\-NA\-ME

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya. V} UNIX {\cyr za\-da\-no
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}}

set LO\-G\-NA\-ME={\cyr im\-ya-pol{\cprime}\-zo\-va\-te\-l\-ya}

TZ

{\cyr Cha\-so\-vo{\u i} po\-yas. V} UNIX {\cyr za\-dan
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}} set.

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Ne za\-bud{\cprime}\-te, chto ne\-o\-b\-kho\-di\-my
me\-ry dlya to\-go, chto\-by pro\-be\-ly me\-zh\-du fla\-ga\-mi ne byli
ob\-ra\-bo\-ta\-ny ko\-ma\-n\-dnym in\-te\-r\-p\-re\-ta\-to\-rom
pre\-zh\-de\-v\-re\-me\-n\-no, za\-shchi\-shcha{\u i}\-te ikh,
na\-p\-ri\-mer, ka\-v\-y\-ch\-ka\-mi. Sm.} ci(1) .

{\cyr SO\-O\-B\-SHCHE\-NI\-Ya

Vo\-z\-v\-ra\-shch\-aet ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0
es\-li net na\-k\-la\-dok, 1 es\-li est{\cprime}
ne\-bol{\cprime}\-sh\-ie pro\-b\-le\-my, s ko\-to\-r\-y\-mi
pro\-g\-ra\-m\-ma spra\-v\-l\-yaet\-s\-ya po ee mne\-ni\-yu, i 2 es\-li
na\-k\-la\-d\-ki sli\-sh\-kom ser{\cprime}\-ezny dlya ra\-bo\-ty.

SM. TA\-K\-ZHE}

ci(1), co(1), rcsintro(1), rcsfile(5),

ident(1), merge(1), rlog(1), rcs(1), rcsdiff(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


\chapter{MERGE(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

me\-r\-ge - {\cyr ob{\cdprime}edi\-ne\-n\-ie iz\-me\-ne\-ni{\u i},
sde\-la\-n\-nykh v dvukh ve\-r\-si\-yakh od\-no\-go fa{\u i}\-la v
si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

me\-r\-ge $[${\cyr fla\-gi$]$ im\-ya-fa{\u i}\-la1 im\-ya-fa{\u i}\-la2
im\-ya-fa{\u i}\-la3

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} me\-r\-ge {\cyr so\-ve\-r\-sh\-aet s pe\-r\-vym fa{\u
i}\-lom te zhe iz\-me\-ne\-ni\-ya, ko\-to\-r\-ye byli sde\-la\-ny so
vto\-rym, chto\-by po\-lu\-chit{\cprime} tre\-ti{\u i}.
Re\-zul{\cprime}\-tat za\-pi\-s\-y\-v\-aet\-s\-ya v pe\-r\-vy{\u i}
fa{\u i}l i v \`etom edi\-n\-s\-t\-ve\-n\-n\-oe ot\-sut\-s\-t\-v\-ie
si\-m\-me\-t\-r\-ii me\-zh\-du pe\-r\-vym i tret{\cprime}\-im fa{\u
i}\-la\-mi. O de\-ta\-l\-yakh sm. flag} -j {\cyr ko\-ma\-n\-dy} co .

{\cyr Pro\-b\-le\-my na\-chi\-na\-yut\-s\-ya, ko\-g\-da
iz\-me\-ne\-ni\-ya ot\-no\-si\-tel{\cprime}\-no vto\-ro\-go fa{\u
i}\-la byli sde\-la\-ny v od\-nikh i tekh zhe stro\-kakh pe\-r\-vo\-go
i tret{\cprime}\-e\-go fa{\u i}\-lov. Ko\-ma\-n\-da} me\-r\-ge {\cyr
vydast ob \`etom pre\-du\-p\-re\-zh\-de\-n\-ie v ka\-nal vyda\-chi
oshi\-bok, i po\-me\-tit me\-s\-to, ko\-to\-r\-oe ne mo\-g\-lo
byt{\cprime} ob\-ra\-bo\-ta\-no av\-to\-ma\-ti\-che\-s\-ki
li\-ni\-ya\-mi vi\-da $<$$<$$<$$<$$<$$<$$<$ i $>$$>$$>$$>$$>$$>$$>$ .
Ti\-pi\-ch\-n\-oe so\-o\-b\-shche\-n\-ie vyglya\-dit tak:

$<$$<$$<$$<$$<$$<$$<$ im\-ya-fa{\u i}\-la1

stro\-ki pe\-r\-vo\-go fa{\u i}\-la}

=======

{\cyr stro\-ki tret{\cprime}\-e\-go fa{\u i}\-la

$>$$>$$>$$>$$>$$>$$>$ im\-ya-fa{\u i}\-la3

Pol{\cprime}\-zo\-va\-te\-l\-yu pre\-d\-la\-g\-aet\-s\-ya
ot\-re\-da\-k\-ti\-ro\-vat{\cprime} re\-zul{\cprime}\-tat
vru\-ch\-nu\-yu, kak pra\-vi\-lo uda\-lit{\cprime} li\-sh\-n\-ee.

FLA\-GI}

-A

{\cyr Es\-li ko\-ma\-n\-da} diff3(1) {\cyr na va\-shem
komp{\cprime}\-yu\-te\-re po\-d\-de\-r\-zhi\-v\-aet flag} -A {\cyr , to
so\-o\-b\-shche\-ni\-ya vyda\-yut\-s\-ya ime\-n\-no v \`etom sti\-le. V
ito\-ge, pri\-me\-ne\-n\-ie iz\-me\-ne\-ni{\u i} ve\-du\-shchikh ot
pe\-r\-vo{\u i} ve\-r\-s\-ii ko vto\-ro{\u i}, k ra\-bo\-che\-mu fa{\u
i}\-lu, po\-ro\-zh\-da\-ya pri \`etom sa\-mu\-yu po\-d\-ro\-b\-nu\-yu
in\-fo\-r\-ma\-ci\-yu. Uti\-li\-ta} diff3 {\cyr iz
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go pa\-ke\-ta} GNU {\cyr \`etot
flag po\-d\-de\-r\-zhi\-v\-aet, po\`eto\-mu im\-eet smysl
uka\-zat{\cprime} pri po\-s\-t\-ro\-e\-n\-ii} RCS {\cyr na va\-shem
komp{\cprime}\-yu\-te\-re, chto is\-pol{\cprime}\-z\-uet\-s\-ya
ime\-n\-no \`eta ve\-r\-si\-ya uti\-li\-ty.}

-E, -e

{\cyr \`Eti fla\-gi za\-da\-yut stil{\cprime} so\-o\-b\-shche\-ni{\u i}
o na\-lo\-zhe\-n\-ii iz\-me\-ne\-ni{\u i}, me\-n\-ee
po\-d\-ro\-b\-ny{\u i}, chem} -A{\cyr . Sm.} diff3(1) {\cyr . Po
umo\-l\-cha\-ni\-yu is\-pol{\cprime}\-z\-uet\-s\-ya} -E{\cyr . Flag} -e
{\cyr ne po\-ro\-zh\-d\-aet ni\-ka\-kikh pre\-du\-p\-re\-zh\-de\-ni{\u
i}.}

-L la\-bel

{\cyr Flag mo\-zhet byt{\cprime} is\-pol{\cprime}\-zo\-van do trekh raz
i za\-d\-aet im\-ya, ko\-to\-r\-oe bu\-det is\-pol{\cprime}\-zo\-va\-no
v so\-o\-b\-shche\-ni\-yakh, vme\-s\-to
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go ime\-ni fa{\u i}\-la. Tak
ko\-ma\-n\-da}

me\-r\-ge -L x -L y -L z a b c

{\cyr vy\-dast so\-ob\-shche\-nie vy\-glya\-dya\-shchee tak, bu\-d\-to
ime\-na srav\-nen\-nykh fa{\u i}\-lov by\-li} x, y {\cyr i} z {\cyr a
ne} a, b {\cyr i} c.

-p$[$rev$]$

{\cyr Re\-zul{\cprime}\-tat za\-pi\-s\-y\-v\-aet\-s\-ya ne v
ra\-bo\-chi{\u i} fa{\u i}l, a v sta\-n\-da\-r\-tny{\u i} vyvod.}

-q$[$rev$]$

{\cyr Vse so\-o\-b\-shche\-ni\-ya po\-da\-v\-l\-ya\-yut\-s\-ya.
Is\-pol{\cprime}\-z\-uet\-s\-ya v fo\-no\-vom re\-zhi\-me.}

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr na
sta\-n\-da\-r\-tny{\u i} vyvod.

SO\-O\-B\-SHCHE\-NI\-Ya

Vo\-z\-v\-ra\-shch\-aet ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0
es\-li net na\-k\-la\-dok, 1 es\-li est{\cprime}
ne\-bol{\cprime}\-sh\-ie pro\-b\-le\-my, s ko\-to\-r\-y\-mi
pro\-g\-ra\-m\-ma spra\-v\-l\-yaet\-s\-ya po ee mne\-ni\-yu, i 2 es\-li
na\-k\-la\-d\-ki sli\-sh\-kom ser{\cprime}\-ezny dlya ra\-bo\-ty.

SM. TA\-K\-ZHE}

diff3(1), diff(1), rcsmerge(1), co(1).

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


{\cyr PRO\-B\-LE\-MY

Pro\-g\-ra\-m\-ma ra\-bo\-t\-aet i s dvo\-i\-ch\-n\-ymi fa{\u
i}\-la\-mi, no re\-zul{\cprime}\-tat ra\-bo\-ty ne vse\-g\-da
os\-myslen.}

\chapter{RCSDIFF(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rcsdiff - {\cyr sra\-v\-ne\-n\-ie ve\-r\-si{\u i} fa{\u i}\-la v
si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

rcsdiff $[$ -ksubst $]$ $[$ -q $]$ $[$ -rrev1 $[$ -rrev2 $]$ $]$ $[$ -T
$]$ $[$ -V$[$n$]$ $]$ $[$ -xsuffixes $]$ \\$[$ -zzone $]$ $[$ diff
{\cyr fla\-gi$]$ im\-ya-fa{\u i}\-la ...

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} rcsdiff {\cyr vyzyvaet ko\-ma\-n\-du} diff(1) {\cyr dlya
sra\-v\-ne\-ni\-ya dvukh ve\-r\-si{\u i} od\-no\-go fa{\u i}\-la.

Po\-l\-n\-oe im\-ya fa{\u i}\-la, so\-de\-r\-zha\-shch\-ee
ar\-khi\-v\-ny{\u i} su\-f\-fiks, so\-o\-t\-vet\-s\-t\-v\-uet
ar\-khi\-v\-no\-mu fa{\u i}\-lu, vse pro\-ch\-ie schi\-ta\-yut\-s\-ya
ra\-bo\-chi\-mi fa{\u i}\-la\-mi. O so\-o\-t\-vet\-s\-t\-v\-ii imen
fa{\u i}\-lov, sm.} ci(1) {\cyr . Tam zhe opi\-sa\-ny spo\-so\-by
za\-da\-ni\-ya no\-me\-rov ve\-r\-si{\u i}.

Fla\-gom} -r {\cyr mo\-gut byt{\cprime} za\-da\-ny nol{\cprime}, od\-na
ili dve ve\-r\-s\-ii. Es\-li za\-da\-na od\-na ve\-r\-si\-ya, to v
ka\-che\-s\-t\-ve vto\-ro{\u i} be\-ret\-s\-ya ra\-bo\-chi{\u i} fa{\u
i}l. Es\-li obe ve\-r\-s\-ii ne za\-da\-ny, to v ka\-che\-s\-t\-ve
pe\-r\-vo{\u i} be\-ret\-s\-ya po\-s\-le\-d\-n\-ya\-ya vetv{\cprime} na
ve\-t\-vi, za\-da\-n\-no{\u i} po umo\-l\-cha\-ni\-yu (ob\-ychno --
gla\-v\-no{\u i}), chto udo\-b\-no is\-pol{\cprime}\-zo\-vat{\cprime}
dlya re\-vi\-z\-ii iz\-me\-ne\-ni{\u i} sde\-la\-n\-nykh s
mo\-me\-n\-ta po\-s\-le\-d\-ne\-go vo\-s\-t\-re\-bo\-va\-ni\-ya fa{\u
i}\-la iz ar\-khi\-va. Ve\-r\-s\-ii mo\-gut byt{\cprime} za\-da\-ny v
ya\-v\-nom vi\-de, chi\-s\-le\-n\-no, ili v si\-m\-vol{\cprime}\-nom
vi\-de.

Flag} -ksubst {\cyr Us\-ta\-na\-v\-li\-v\-aet pra\-vi\-la
po\-d\-s\-ta\-no\-v\-ki klyu\-che\-vykh si\-m\-vo\-lov pri
iz\-vle\-che\-n\-ii dlya sra\-v\-ne\-ni\-ya. Vo\-z\-mo\-zh\-n\-ye
pra\-vi\-la} subst {\cyr opi\-sa\-ny v} co(1){\cyr . Ya\-v\-n\-oe
za\-da\-n\-ie fla\-ga} -k {\cyr po\-da\-vit za\-da\-n\-n\-oe po
umo\-l\-cha\-ni\-yu zna\-che\-n\-ie. Na\-p\-ri\-mer,} -kk -r1.1 -r1.2
{\cyr ig\-no\-ri\-r\-uet ra\-z\-ni\-cu svya\-za\-n\-nu\-yu s
ra\-z\-n\-y\-mi zna\-che\-ni\-ya\-mi klyu\-che\-vykh si\-m\-vo\-lov v
ve\-r\-si\-yakh 1.1} to 1.2{\cyr . Chto\-by
umen{\cprime}\-shit{\cprime} vyda\-chu i ig\-no\-ri\-ro\-vat{\cprime}
ra\-z\-li\-chi\-ya vyzva\-n\-n\-ye po\-d\-s\-ta\-no\-v\-ko{\u i}
klyu\-che\-vykh si\-m\-vo\-lov, po umo\-l\-cha\-ni\-yu za\-dan flag}
-kkvl {\cyr , es\-li: (1) za\-da\-na kho\-t\-ya by od\-na
ve\-r\-si\-ya, (2) flag} -k {\cyr ne za\-dan ya\-v\-no , (3)
po\-d\-s\-ta\-no\-v\-ka klyu\-che\-vykh slov po umo\-l\-cha\-ni\-yu
za\-da\-na fla\-gom} -kkv {\cyr i (4) at\-ri\-bu\-ty ra\-bo\-che\-go
fa{\u i}\-la byli so\-z\-da\-ny ko\-ma\-n\-do{\u i}} co -l .

{\cyr Flag} -q {\cyr po\-da\-v\-l\-yaet vyda\-chu
so\-o\-b\-shche\-ni{\u i}. O fla\-gakh} -T, -V, -x {\cyr i} -z {\cyr
sm.} co(1) .

{\cyr Vo\-s\-p\-ri\-ni\-ma\-yut\-s\-ya vse fla\-gi ko\-ma\-n\-dy}
diff(1) {\cyr , pri\-me\-ni\-m\-ye k obychnym fa{\u i}\-lam.
Ko\-n\-k\-re\-t\-na\-ya ve\-r\-si\-ya ko\-ma\-n\-dy} diff {\cyr
za\-d\-aet\-s\-ya vo vre\-m\-ya po\-s\-t\-ro\-e\-ni\-ya pa\-ke\-ta}
RCS; {\cyr re\-ko\-me\-n\-d\-uet\-s\-ya
is\-pol{\cprime}\-zo\-vat{\cprime} ve\-r\-si\-yu iz
so\-o\-t\-vet\-s\-t\-vu\-yu\-shche\-go pa\-ke\-ta} GNU.

{\cyr PRI\-ME\-RY

Ko\-ma\-n\-da}

rcsdiff f.c

{\cyr sra\-v\-nit ra\-bo\-chi{\u i} fa{\u i}l s po\-s\-le\-d\-ne{\u i}
ve\-r\-s\-ie{\u i} na gla\-v\-no{\u i} ve\-t\-vi.

PE\-RE\-ME\-N\-N\-YE SRE\-DY}

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Ne za\-bud{\cprime}\-te, chto ne\-o\-b\-kho\-di\-my
me\-ry dlya to\-go, chto\-by pro\-be\-ly me\-zh\-du fla\-ga\-mi ne byli
ob\-ra\-bo\-ta\-ny ko\-ma\-n\-dnym in\-te\-r\-p\-re\-ta\-to\-rom
pre\-zh\-de\-v\-re\-me\-n\-no, za\-shchi\-shcha{\u i}\-te ikh,
na\-p\-ri\-mer, ka\-v\-y\-ch\-ka\-mi. Sm.} ci(1) .

{\cyr SO\-O\-B\-SHCHE\-NI\-Ya

Vo\-z\-v\-ra\-shch\-aet ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0
es\-li net ra\-z\-li\-chi{\u i}, 1 es\-li est{\cprime}
ne\-bol{\cprime}\-sh\-ie ra\-z\-li\-chi\-ya, s ko\-to\-r\-y\-mi
pro\-g\-ra\-m\-ma spra\-v\-l\-yaet\-s\-ya po ee mne\-ni\-yu, i 2 es\-li
ra\-z\-li\-chi\-ya sli\-sh\-kom ser{\cprime}\-ezny dlya ra\-bo\-ty.

SM. TA\-K\-ZHE}

diff(1), rcsintro(1), ci(1), co(1), rcs(1),

ident(1), rcsmerge(1), rlog(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


\chapter{RLOG(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rlog - {\cyr is\-to\-ri\-ya iz\-me\-ne\-ni\-ya i pro\-cha\-ya
in\-fo\-r\-ma\-ci\-ya ob ar\-khi\-v\-nom fa{\u i}\-le

FO\-R\-MAT KO\-MA\-N\-DY}

rlog $[${\cyr fla\-gi$]$ im\-ya-fa{\u i}\-la ...

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} rlog {\cyr iz\-vle\-k\-aet
re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu in\-fo\-r\-ma\-ci\-yu iz
ar\-khi\-v\-no\-go fa{\u i}\-la v si\-s\-te\-me
ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS.

{\cyr Po\-l\-n\-oe im\-ya fa{\u i}\-la, so\-de\-r\-zha\-shch\-ee
ar\-khi\-v\-ny{\u i} su\-f\-fiks, so\-o\-t\-vet\-s\-t\-v\-uet
ar\-khi\-v\-no\-mu fa{\u i}\-lu, vse pro\-ch\-ie schi\-ta\-yut\-s\-ya
ra\-bo\-chi\-mi fa{\u i}\-la\-mi. O so\-o\-t\-vet\-s\-t\-v\-ii imen
fa{\u i}\-lov, sm.} ci(1) .

{\cyr Ko\-ma\-n\-da} rlog {\cyr vyvo\-dit v sta\-n\-da\-r\-tny{\u i}
vyvod sle\-du\-yu\-shchu\-yu in\-fo\-r\-ma\-ci\-yu: po\-l\-ny{\u i}
put{\cprime} k ar\-khi\-v\-no\-mu i ra\-bo\-che\-mu fa{\u i}\-lam v
ab\-so\-l\-yu\-t\-no{\u i} fo\-r\-me, za\-go\-lo\-vok s no\-me\-rom
po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii v gla\-v\-no{\u i} ve\-t\-vi,
vetv{\cprime}, is\-pol{\cprime}\-zu\-e\-mu\-yu po umo\-l\-cha\-ni\-yu,
spi\-sok lic, ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u
i}\-la, spi\-sok lic, za\-b\-ro\-ni\-ro\-va\-v\-shikh ka\-k\-ie-li\-bo
ve\-r\-s\-ii dlya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i},
si\-m\-vo\-li\-che\-s\-k\-ie ime\-na (no\-me\-ra ve\-r\-si{\u i})
op\-re\-de\-le\-n\-n\-ye dlya da\-n\-no\-go ar\-khi\-va,
ar\-khi\-v\-ny{\u i} su\-f\-fiks, ob\-shchee chi\-s\-lo ve\-r\-si{\u
i}, chi\-s\-lo ve\-r\-si{\u i}, o ko\-to\-rykh vyvo\-dit\-s\-ya
in\-fo\-r\-ma\-ci\-ya i opi\-sa\-n\-ie fa{\u i}\-la. Po\-s\-le
\`eto\-go vydaet\-s\-ya in\-fo\-r\-ma\-ci\-ya po za\-da\-n\-nym v
ko\-ma\-n\-d\-no{\u i} stro\-ke ve\-r\-si\-yam, v ob\-ra\-t\-nom
khro\-no\-lo\-gi\-che\-s\-kom po\-r\-ya\-d\-ke dlya ka\-zh\-do{\u i}
ve\-t\-vi. Dlya ka\-zh\-do{\u i} ve\-r\-s\-ii so\-o\-b\-shchaet\-s\-ya:
no\-mer ve\-r\-s\-ii da\-ta i vre\-m\-ya re\-gi\-s\-t\-ra\-c\-ii,
ko\-li\-che\-s\-t\-vo li\-ni{\u i}, do\-ba\-v\-le\-n\-nykh i
uda\-le\-n\-nykh po sra\-v\-ne\-ni\-yu s pre\-d\-y\-du\-shche{\u i}
ve\-r\-s\-ie{\u i}, pol{\cprime}\-zo\-va\-tel{\cprime},
za\-b\-ro\-ni\-ro\-va\-v\-shi{\u i} da\-n\-nu\-yu ve\-r\-si\-yu dlya
vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i} (es\-li ve\-r\-si\-ya
za\-b\-ro\-ni\-ro\-va\-na), i re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu
za\-pis{\cprime}. Es\-li fla\-gom} -z {\cyr ne za\-dan dru\-go{\u i}
fo\-r\-mat, da\-ty i vre\-m\-ya uka\-z\-y\-va\-yut\-s\-ya vo
Vse\-mi\-r\-nom Vre\-me\-ni (}UTC{\cyr ). Po\-l\-na\-ya
in\-fo\-r\-ma\-ci\-ya pe\-cha\-t\-aet\-s\-ya bez za\-da\-ni\-ya
fla\-gov, Sle\-du\-yu\-shch\-ie fla\-gi og\-ra\-ni\-chi\-va\-yut
vyda\-chu.}

-L

{\cyr Pro\-pu\-s\-tit{\cprime} ar\-khi\-v\-n\-ye fa{\u i}\-ly, ne
so\-de\-r\-zha\-shch\-ie za\-re\-ze\-r\-vi\-ro\-va\-n\-nykh
ve\-r\-si{\u i}, chto \`ek\-vi\-va\-le\-n\-t\-no
so\-v\-me\-s\-t\-no\-mu za\-da\-ni\-yu} -h, -l {\cyr i} -R.

-R

{\cyr Vydat{\cprime} tol{\cprime}\-ko im\-ya ar\-khi\-v\-no\-go fa{\u
i}\-la, chto \`ek\-vi\-va\-le\-n\-t\-no pre\-o\-b\-ra\-zo\-va\-ni\-yu
po\-l\-no\-go ime\-ni ra\-bo\-che\-go fa{\u i}\-la v im\-ya
ar\-khi\-v\-no\-go fa{\u i}\-la.}

-h

{\cyr Pe\-cha\-t\-aet po\-l\-ny{\u i} put{\cprime} k ar\-khi\-v\-no\-mu
i ra\-bo\-che\-mu fa{\u i}\-lam v ab\-so\-l\-yu\-t\-no{\u i} fo\-r\-me,
za\-go\-lo\-vok s no\-me\-rom po\-s\-le\-d\-ne{\u i} ve\-r\-s\-ii v
gla\-v\-no{\u i} ve\-t\-vi, vetv{\cprime},
is\-pol{\cprime}\-zu\-e\-mu\-yu po umo\-l\-cha\-ni\-yu, spi\-sok lic,
ime\-yu\-shchikh do\-s\-tup k iz\-me\-ne\-ni\-yu fa{\u i}\-la, spi\-sok
lic, za\-b\-ro\-ni\-ro\-va\-v\-shikh ka\-k\-ie-li\-bo ve\-r\-s\-ii dlya
vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i}, si\-m\-vo\-li\-che\-s\-k\-ie
ime\-na (no\-me\-ra ve\-r\-si{\u i}) op\-re\-de\-le\-n\-n\-ye dlya
da\-n\-no\-go ar\-khi\-va i ar\-khi\-v\-ny{\u i} su\-f\-fiks.}

-t

{\cyr To zhe, chto i} -h{\cyr , plyus opi\-sa\-n\-ie fa{\u i}\-la.}

-N

{\cyr Ne vydaet si\-m\-vo\-li\-che\-s\-k\-ie ime\-na.}

-b

{\cyr Vydaet in\-fo\-r\-ma\-ci\-yu o ve\-r\-si\-yakh ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu.}

-ddates

{\cyr So\-o\-b\-shchaet in\-fo\-r\-ma\-ci\-yu o ve\-r\-si\-yakh,
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-nykh v pro\-me\-zhu\-t\-ke
vre\-me\-ni, op\-re\-de\-l\-ya\-e\-mom pa\-ra\-me\-t\-rom} dates.
{\cyr Pro\-me\-zhu\-tok, za\-da\-n\-ny{\u i} v fo\-r\-me} d1$<$d2 {\cyr
ili} d2$>$d1 {\cyr , op\-re\-de\-l\-yaet ve\-r\-s\-ii,
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-n\-ye me\-zh\-du mo\-me\-n\-ta\-mi} d1
{\cyr i} d2 {\cyr is\-klyu\-chi\-tel{\cprime}\-no. Pro\-me\-zhu\-tok,
za\-da\-n\-ny{\u i} v fo\-r\-me $<$}d {\cyr ili} d$>$ , ({\cyr
so\-o\-t\-vet\-s\-t\-ve\-n\-no,} d$<$ {\cyr ili $>$}d{\cyr )
op\-re\-de\-l\-yaet ve\-r\-s\-ii,
za\-re\-gi\-s\-t\-ri\-ro\-va\-n\-n\-ye stro\-go do
(so\-o\-t\-vet\-s\-t\-ve\-n\-no, po\-s\-le) mo\-me\-n\-ta} d {\cyr .
Es\-li po\-s\-le zna\-ka ne\-ra\-ve\-n\-s\-t\-va do\-ba\-v\-len znak
ra\-ve\-n\-s\-t\-va, to ko\-n\-cy pro\-me\-zhu\-t\-ka
vklyu\-cha\-yut\-s\-ya v ra\-s\-s\-ma\-t\-ri\-v\-ae\-my{\u i}
in\-te\-r\-val. Pa\-ra\-me\-t\-ry} d, d1 {\cyr i} d2 {\cyr mo\-gut
byt{\cprime} za\-da\-ny po\-ch\-ti v svo\-bo\-d\-nom fo\-r\-ma\-te,
sm.} co(1){\cyr . Dlya to\-go , chto\-by si\-m\-vo\-ly $<$ i $>$ ne
byli vo\-s\-p\-ri\-n\-ya\-ty ko\-ma\-n\-dnym
in\-te\-r\-p\-re\-ta\-to\-rom kak si\-m\-vol
pe\-re\-na\-p\-ra\-v\-le\-ni\-ya po\-to\-kov vvo\-da-vyvo\-da, a byli
pe\-re\-da\-ny vyzyva\-e\-mo{\u i} pro\-g\-ra\-m\-me kak ar\-gu\-ment,
za\-shchi\-shcha{\u i}\-te ikh ot in\-te\-r\-p\-re\-ta\-c\-ii
ob\-ra\-t\-no{\u i} ko\-so{\u i} che\-r\-to{\u i}, ili vse
vyra\-zhe\-n\-ie} date {\cyr -- ka\-v\-y\-ch\-ka\-mi. Es\-li
tre\-b\-uet\-s\-ya ob{\cdprime}edi\-nit{\cprime}
ne\-s\-kol{\cprime}\-ko ra\-z\-ro\-z\-ne\-n\-nykh in\-te\-r\-va\-lov,
ra\-z\-de\-li\-te\-lem slu\-zhit dvo\-e\-to\-ch\-ie.}

-l$[$Lockers$]$

{\cyr So\-o\-b\-shchat{\cprime} in\-fo\-r\-ma\-ci\-yu tol{\cprime}\-ko
o ve\-r\-si\-yakh, za\-b\-ro\-ni\-ro\-va\-n\-nykh dlya vne\-se\-ni\-ya
iz\-me\-ne\-ni{\u i}. Es\-li za\-dan spi\-sok} lo\-c\-kers {\cyr
pol{\cprime}\-zo\-va\-te\-le{\u i} s za\-p\-ya\-t\-y\-mi v
ka\-che\-s\-t\-ve ra\-z\-de\-li\-te\-le{\u i}, to ve\-r\-s\-ii,
za\-b\-ro\-ni\-ro\-va\-n\-n\-ye os\-tal{\cprime}\-n\-y\-mi,
ig\-no\-ri\-ru\-yut\-s\-ya. Na\-p\-ri\-mer,} rlog -L -R -lwft
RCS/$\star$ {\cyr so\-o\-b\-shchit o vsekh fa{\u i}\-lakh, s
ko\-to\-r\-y\-mi ra\-bo\-t\-aet pol{\cprime}\-zo\-va\-tel{\cprime}}
wft.

-r$[$Revisions$]$

{\cyr So\-ob\-shchit{\cprime} in\-for\-ma\-ciyu o ver\-si\-yakh i
pro\-me\-zhut\-kakh ver\-si{\u i}, raz\-de\-len\-nykh za\-pya\-ty\-mi.
Es\-li pro\-me\-zhu\-tok ime\-et vid} rev1:rev2 {\cyr to o vsekh
ver\-si\-yakh na\-chi\-naya s} rev1 {\cyr i kon\-chaya} rev2 {\cyr
vklyu\-chi\-tel{\cprime}\-no, na od\-no{\u i} ve\-t\-vi;} :rev {\cyr
ozna\-cha\-et pro\-me\-zhu\-tok ot na\-cha\-la
so\-ot\-vet\-stvu\-yu\-shche{\u i} ve\-t\-vi do} rev {\cyr
vklyu\-chi\-tel{\cprime}no;} rev: {\cyr ozna\-cha\-et pro\-me\-zhu\-tok
ot} rev {\cyr do ko\-n\-ca so\-ot\-vet\-s\-tvu\-yu\-shche{\u i}
ve\-t\-vi vklyu\-chi\-tel{\cprime}\-no. Es\-li uka\-zan no\-mer
ve\-t\-vi, to o vsekh ver\-si\-yakh da\-n\-no{\u i} ve\-t\-vi;
ce\-ly{\u i} in\-ter\-val ve\-t\-ve{\u i} ozna\-cha\-et vse ver\-sii
ve\-t\-ve{\u i} iz in\-ter\-va\-la. Es\-li no\-mer ve\-tvi
okan\-chi\-va\-et\-sya toch\-ko{\u i}, ime\-et\-sya v vi\-du
po\-sled\-nyaya ver\-siya za\-da\-n\-no{\u i} ve\-t\-vi. Pro\-sto} -r
{\cyr ozna\-cha\-et po\-sled\-nyuyu ver\-siyu ve\-t\-vi,
is\-pol{\cprime}\-zu\-e\-mo{\u i} po umol\-cha\-niyu.}

-sstates

{\cyr So\-ob\-shchit{\cprime} in\-for\-ma\-ciyu o ver\-si\-yakh, u
ko\-to\-rykh at\-ri\-but} state {\cyr so\-ot\-vet\-s\-tvu\-et
at\-ri\-bu\-tam iz spi\-s\-ka, raz\-de\-len\-no\-go
za\-pya\-ty\-mi.}

-w$[$logins$]$


{\cyr So\-ob\-shchit{\cprime} in\-for\-ma\-ciyu o ver\-si\-yakh,
ko\-to\-rye by\-li za\-re\-gis\-tri\-ro\-va\-ny
pol{\cprime}\-zo\-va\-te\-lya\-mi iz spi\-s\-ka, raz\-de\-len\-no\-go
za\-pya\-ty\-mi. Es\-li spi\-sok pust, ime\-et\-sya v vi\-du sam
za\-pra\-shi\-va\-yu\-shchi{\u i} pol{\cprime}\-zo\-va\-tel{\cprime}.}

-T

{\cyr Pri\-sut\-s\-t\-v\-uet is\-klyu\-chi\-tel{\cprime}\-no dlya
so\-v\-me\-s\-ti\-mo\-s\-ti s dru\-gi\-mi ko\-ma\-n\-da\-mi} RCS {\cyr
, dlya ko\-to\-rykh za\-d\-aet fo\-r\-mat da\-ty pri}

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr na
sta\-n\-da\-r\-tny{\u i} vyvod.}

-Vn

{\cyr Imi\-ti\-r\-uet po\-ve\-de\-n\-ie ve\-r\-s\-ii} n {\cyr
ko\-m\-p\-le\-k\-sa pro\-g\-ramm} RCS . {\cyr Sm.} co(1) .

-xsuffixes

{\cyr Za\-d\-aet su\-f\-fiks, do\-ba\-v\-l\-ya\-e\-my{\u i} k ime\-ni
ar\-khi\-v\-no\-go fa{\u i}\-la. Sm.} ci(1) .

{\cyr Ko\-ma\-n\-da} rlog {\cyr so\-o\-b\-shchaet in\-fo\-r\-ma\-ci\-yu
tol{\cprime}\-ko o ve\-r\-si\-yakh,
udo\-v\-le\-t\-vo\-r\-ya\-yu\-shchikh od\-no\-v\-re\-me\-n\-no vsem
us\-lo\-vi\-yam, za\-da\-n\-nym fla\-ga\-mi} -d, -l, -s {\cyr i} -w
{\cyr iz tekh, chto udo\-v\-le\-t\-vo\-r\-ya\-yut kho\-t\-ya by
od\-no\-mu iz og\-ra\-ni\-che\-ni{\u i}, na\-lo\-zhe\-n\-nykh
fla\-ga\-mi} -b {\cyr i} -r.

-zzone

{\cyr Za\-d\-aet fo\-r\-mat da\-ty pri po\-d\-s\-ta\-no\-v\-ke
klyu\-che\-vykh slov v ma\-r\-ke\-ry i cha\-so\-vo{\u i} po\-yas dlya
fla\-ga} -ddate {\cyr . Pa\-ra\-metr} zone {\cyr do\-l\-zhen
byt{\cprime} li\-bo pust, li\-bo ya\-v\-l\-yat{\cprime}\-s\-ya
chi\-s\-le\-n\-nym zna\-che\-n\-iem ot\-klo\-ne\-ni\-ya ot
Vse\-mi\-r\-no\-go Vre\-me\-ni (}UTC{\cyr ), li\-bo
spe\-c\-ial{\cprime}\-no{\u i} stro\-ko{\u i}} LT {\cyr ,
za\-da\-yu\-shche{\u i} is\-pol{\cprime}\-zo\-va\-n\-ie
me\-s\-t\-no\-go vre\-me\-ni. Po umo\-l\-cha\-ni\-yu, i
opu\-shche\-n\-ny{\u i} pa\-ra\-metr} zone {\cyr , za\-da\-yut
is\-pol{\cprime}\-zo\-va\-n\-ie Vse\-mi\-r\-no\-go Vre\-me\-ni s
is\-pol{\cprime}\-zo\-va\-n\-iem ko\-so{\u i} che\-r\-ty v
ka\-che\-s\-t\-ve ra\-z\-de\-li\-te\-l\-ya po\-le{\u i} dlya da\-ty
(sm. pri\-mer). V os\-tal{\cprime}\-nykh slu\-cha\-yakh
is\-pol{\cprime}\-z\-uet\-s\-ya sta\-n\-dart} ISO 8601{\cyr .
Na\-p\-ri\-mer, pust{\cprime} te\-ku\-shch\-ee vre\-m\-ya 8 cha\-sov
ve\-che\-ra, 11 ya\-n\-va\-r\-ya 1990, v Ti\-kho\-o\-ke\-a\-n\-s\-kom
cha\-so\-vom po\-ya\-se SShA (chto na 8 cha\-sov po\-z\-zhe, chem v
Gri\-n\-vi\-che). To\-g\-da dlya po\-d\-s\-ta\-no\-vok bu\-det
is\-pol{\cprime}\-zo\-va\-no}

\begin{tabular}{ll}
{\cyr flag} & {\cyr fo\-r\-mat vre\-me\-ni}\\
-z & 1990/01/12 04:00:00 {\cyr (po umo\-l\-cha\-ni\-yu)}\\
-zLT & 1990-01-11 20:00:00-08\\
-z+05:30 & 1990-01-12 09:30:00+05:30
\end{tabular}

{\cyr Flag} -z {\cyr vli\-yaet tol{\cprime}\-ko na ma\-r\-ke\-ry, i ne
me\-n\-yaet fo\-r\-ma\-ta da\-ty i vre\-me\-ni v ar\-khi\-v\-nom fa{\u
i}\-le, ko\-to\-r\-ye vse\-g\-da za\-d\-aet\-s\-ya vo Vse\-mi\-r\-nom
Vre\-me\-ni.

PRI\-ME\-RY}

rlog -L -R RCS/$\star$

rlog -L -h RCS/$\star$

rlog -L -l RCS/$\star$

rlog RCS/$\star$

{\cyr Pe\-r\-va\-ya iz ko\-mand so\-o\-b\-shchaet ime\-na vsekh
ar\-khi\-v\-nykh fa{\u i}\-lov (v po\-d\-ka\-ta\-lo\-ge} RCS{\cyr )
ime\-yu\-shchikh ve\-r\-s\-ii, za\-b\-ro\-ni\-ro\-va\-n\-n\-ye dlya
vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i}. Vto\-ra\-ya -- ar\-khi\-v\-n\-ye
za\-go\-lo\-v\-ki tekh zhe fa{\u i}\-lov, a tret{\cprime}\-ya --
do\-po\-l\-ni\-tel{\cprime}\-no so\-o\-b\-shchit
re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye za\-pi\-si
za\-b\-ro\-ni\-ro\-va\-n\-nykh ve\-r\-si{\u i}, po\-s\-le\-d\-n\-ya\-ya
-- vsyu vo\-z\-mo\-zh\-nu\-yu in\-fo\-r\-ma\-ci\-yu.

PE\-RE\-ME\-N\-N\-YE SRE\-DY}

LO\-G\-NA\-ME

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya. V} UNIX {\cyr za\-da\-no
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}}

set LO\-G\-NA\-ME={\cyr im\-ya-pol{\cprime}\-zo\-va\-te\-l\-ya}

TZ

{\cyr Cha\-so\-vo{\u i} po\-yas. V} UNIX {\cyr za\-dan
av\-to\-ma\-ti\-che\-s\-ki, v} MS-DOS {\cyr tre\-b\-uet\-s\-ya
za\-dat{\cprime} ya\-v\-no ko\-ma\-n\-do{\u i}} set.

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Ne za\-bud{\cprime}\-te, chto ne\-o\-b\-kho\-di\-my
me\-ry dlya to\-go, chto\-by pro\-be\-ly me\-zh\-du fla\-ga\-mi ne byli
ob\-ra\-bo\-ta\-ny ko\-ma\-n\-dnym in\-te\-r\-p\-re\-ta\-to\-rom
pre\-zh\-de\-v\-re\-me\-n\-no, za\-shchi\-shcha{\u i}\-te ikh,
na\-p\-ri\-mer, ka\-v\-y\-ch\-ka\-mi. Sm.} ci(1) .

{\cyr SO\-O\-B\-shchE\-NI\-Ya

Vo\-z\-v\-ra\-shch\-aet ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0
to\-g\-da i tol{\cprime}\-ko to\-g\-da, ko\-g\-da vse ope\-ra\-c\-ii
za\-ve\-r\-shi\-lis{\cprime} us\-pe\-sh\-no.

SM. TA\-K\-ZHE}

rcsintro(1), ident(1), rcs(1), rcsfile(5),

ci(1), co(1), rcsdiff(1), rcsmerge(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


{\cyr PRO\-B\-LE\-MY

Iz-za so\-v\-me\-s\-ti\-mo\-s\-ti s pre\-d\-y\-du\-shchi\-mi
ve\-r\-si\-ya\-mi} RCS {\cyr , v ko\-to\-rykh v ka\-che\-s\-t\-ve
ra\-z\-de\-li\-te\-l\-ya is\-pol{\cprime}\-zo\-va\-l\-s\-ya mi\-nus
vme\-s\-to dvo\-e\-to\-chi\-ya, vo\-z\-ni\-ka\-yut pro\-b\-le\-my s
si\-m\-vo\-li\-che\-s\-ki\-mi no\-me\-ra\-mi ve\-r\-si{\u i},
na\-chi\-na\-yu\-shchi\-mi\-s\-ya s mi\-nu\-sa. Ko\-ma\-n\-da} rlog -r
{\cyr vo\-s\-p\-ri\-met mi\-nus kak ra\-z\-de\-li\-tel{\cprime}, no
so\-o\-b\-shchit o ne\-u\-da\-ch\-nom vybo\-re
si\-m\-vo\-li\-che\-s\-ko\-go ime\-ni.}

\chapter{IDENT(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

ident - {\cyr ide\-n\-ti\-fi\-ka\-ci\-ya fa{\u i}\-la po klyu\-che\-vym
si\-m\-vo\-lam v si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

ident $[$ -q $]$ $[$ -V $]$ $[$ {\cyr im\-ya-fa{\u i}\-la ... $]$

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} ident {\cyr ishchet po\-d\-s\-t\-ro\-ki vi\-da
\$klyu\-che\-vo{\u i}-si\-m\-vol: tekst\$ v za\-da\-n\-nykh fa{\u
i}\-lakh, a es\-li oni ne uka\-za\-ny, to v sta\-n\-da\-r\-t\-nom
vvo\-de.

Stro\-ki ta\-ko\-go vi\-da vsta\-v\-l\-ya\-yut\-s\-ya v fa{\u i}l
av\-to\-ma\-ti\-che\-s\-ki ko\-ma\-n\-do{\u i}} co(1) {\cyr . Flag} -q
{\cyr po\-da\-v\-l\-yaet so\-o\-b\-shche\-n\-ie ob ot\-sut\-s\-t\-v\-ii
is\-ko\-mykh po\-d\-s\-t\-rok. Flag} -V {\cyr so\-o\-b\-shchaet no\-mer
ve\-r\-s\-ii.

Pro\-g\-ra\-m\-ma} ident {\cyr ra\-bo\-t\-aet kak s
te\-k\-s\-to\-v\-y\-mi fa{\u i}\-la\-mi, tak i s dvo\-i\-ch\-n\-ymi.
Na\-p\-ri\-mer, es\-li pro\-g\-ra\-m\-ma na} C {\cyr v fa{\u i}\-le}
f.c {\cyr so\-de\-r\-zhit}

\#include $<$stdio.h$>$

sta\-tic char const rcsid$[$$]$ =

"\$Id: f.c,v 5.4 1993/11/09 17:40:15 eg\-gert Exp \$";

int main() $\lbrace$ return printf("\%s$\backslash$n", rcsid) == EOF; $\rbrace$

{\cyr i} f.c {\cyr otkompilirovan v fa{\u i}l} f.o{\cyr , togda komanda}

ident f.c f.o

{\cyr so\-o\-b\-shchit:}

f.c:

\$Id: f.c,v 5.4 1993/11/09 17:40:15 eg\-gert Exp \$

f.o:

\$Id: f.c,v 5.4 1993/11/09 17:40:15 eg\-gert Exp \$

{\cyr Sle\-d\-uet za\-me\-tit{\cprime}, chto es\-li pro\-g\-ra\-m\-ma
so\-de\-r\-zhit stro\-ku, po\-do\-b\-nu\-yu upo\-m\-ya\-nu\-to{\u i}
vyshe, no ne is\-pol{\cprime}\-z\-uet ee ni\-kak, to vyda\-yut\-s\-ya
pre\-du\-p\-re\-zh\-da\-yu\-shch\-ie so\-o\-b\-shche\-ni\-ya, a
sli\-sh\-kom um\-nye op\-ti\-mi\-za\-to\-ry uda\-l\-ya\-yut ee iz
is\-po\-l\-n\-ya\-e\-mo\-go fa{\u i}\-la bez iz\-me\-ne\-ni\-ya
re\-zul{\cprime}\-ta\-tov ego ra\-bo\-ty. Po\-to\-mu lu\-ch\-she
is\-pol{\cprime}\-zo\-vat{\cprime} \`eti stro\-ki tak, kak uka\-za\-no
v pri\-me\-re.

Ko\-ma\-n\-da} ident {\cyr ishchet vse po\-d\-s\-t\-ro\-ki vi\-da
\$klyu\-che\-vo{\u i}-si\-m\-vol: tekst\$ da\-zhe es\-li} RCS {\cyr ne
po\-d\-de\-r\-zhi\-v\-aet ta\-ko\-go klyu\-che\-vo\-go si\-m\-vo\-la,
chto udo\-b\-no, es\-li vy ishche\-te vyra\-zhe\-ni\-ya ti\-pa}
\$XCo\-n\-so\-r\-t\-ium\$.

{\cyr KLYu\-CHE\-V\-YE SLO\-VA I IKh ZNA\-chE\-NI\-Ya:

Ni\-zhe pri\-ve\-den spi\-sok klyu\-che\-vykh si\-m\-vo\-lov,
po\-d\-de\-r\-zhi\-v\-ae\-my{\u i}} co(1){\cyr . Po umo\-l\-cha\-ni\-yu
is\-pol{\cprime}\-z\-uet\-s\-ya Vse\-mi\-r\-n\-oe Vre\-m\-ya,
(}UTC{\cyr , ino\-g\-da na\-z\-y\-va\-e\-m\-oe Gri\-n\-vi\-ch\-s\-kim}
GMT{\cyr ) no flag} -zzone {\cyr mo\-zhet \`eto iz\-me\-nit{\cprime}.}

\$Au\-t\-hor\$

{\cyr Im\-ya (}lo\-gin na\-me{\cyr ) pol{\cprime}\-zo\-va\-te\-l\-ya
za\-re\-gi\-s\-t\-ri\-ro\-va\-v\-she\-go da\-n\-nu\-yu ve\-r\-si\-yu.}

\$Da\-te\$

{\cyr Da\-ta i vre\-m\-ya re\-gi\-s\-t\-ra\-c\-ii ve\-r\-s\-ii. Flag}
-zzone {\cyr do\-ba\-vit chi\-s\-lo\-v\-oe zna\-che\-n\-ie
cha\-so\-vo\-go po\-ya\-sa, po umo\-l\-cha\-ni\-yu
is\-pol{\cprime}\-z\-uet\-s\-ya Vse\-mi\-r\-n\-oe Vre\-m\-ya.}

\$He\-a\-der\$

{\cyr Sta\-n\-da\-r\-tny{\u i} za\-go\-lo\-vok. So\-de\-r\-zhit
po\-l\-n\-oe im\-ya fa{\u i}\-la s ab\-so\-l\-yu\-t\-no{\u i}
fo\-r\-mo{\u i} uka\-za\-ni\-ya pu\-ti, no\-mer ve\-r\-s\-ii, da\-tu i
vre\-m\-ya re\-gi\-s\-t\-ra\-c\-ii, av\-to\-ra, sta\-tus i im\-ya
pol{\cprime}\-zo\-va\-te\-l\-ya, za\-b\-ro\-ni\-ro\-va\-v\-she\-go
ve\-r\-si\-yu dlya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i} (es\-li \`eto
tak). Flag} -zzone {\cyr do\-ba\-vit chi\-s\-lo\-v\-oe zna\-che\-n\-ie
cha\-so\-vo\-go po\-ya\-sa, po umo\-l\-cha\-ni\-yu
is\-pol{\cprime}\-z\-uet\-s\-ya Vse\-mi\-r\-n\-oe Vre\-m\-ya.}

\$Id\$

{\cyr To zhe, chto i} \$He\-a\-der\${\cyr , no im\-ya fa{\u i}\-la ne
so\-de\-r\-zhit put{\cprime}.}

\$Locker\$

{\cyr Im\-ya pol{\cprime}\-zo\-va\-te\-l\-ya,
za\-b\-ro\-ni\-ro\-va\-v\-she\-go ve\-r\-si\-yu dlya vne\-se\-ni\-ya
iz\-me\-ne\-ni{\u i}. Pu\-s\-ta\-ya stro\-ka, es\-li fa{\u i}l ne
za\-b\-ro\-ni\-ro\-van.}

\$Log\$

{\cyr Re\-gi\-s\-t\-ra\-ci\-o\-n\-na\-ya za\-pis{\cprime},
vne\-se\-n\-na\-ya pri re\-gi\-s\-t\-ra\-c\-ii so sta\-n\-da\-r\-tnym
za\-go\-lo\-v\-kom vpe\-re\-di. S to\-ch\-ki zre\-ni\-ya ko\-ma\-n\-dy}
ident {\cyr ni\-chem ne ot\-li\-ch\-aet\-s\-ya ot ta\-ko\-go
si\-m\-vo\-la, kak, ska\-zhem,} \$rcsfile\$

\$Na\-me\$

{\cyr Si\-m\-vo\-li\-che\-s\-k\-oe im\-ya,
is\-pol{\cprime}\-zo\-va\-n\-n\-oe pri iz\-vle\-che\-n\-ii fa{\u i}\-la
iz ar\-khi\-va. Na\-p\-ri\-mer,} co -rJoe {\cyr po\-ro\-dit} \$Na\-me:
Joe \$ . {\cyr Pro\-s\-to} co {\cyr po\-ro\-dit pro\-s\-to} \$Na\-me:
\$.

\$rcsfile\$

{\cyr Im\-ya fa{\u i}\-la, bez pu\-ti.}

\$Revision\$

{\cyr No\-mer ve\-r\-s\-ii.}

\$Source\$

{\cyr Po\-l\-n\-oe im\-ya fa{\u i}\-la s ab\-so\-l\-yu\-t\-nym
za\-da\-n\-iem pu\-ti.}

\$Sta\-te\$

{\cyr Sta\-tus za\-da\-n\-ny{\u i} fla\-gom} -s {\cyr ko\-mand} rcs(1)
{\cyr ili} ci(1).

{\cyr Es\-li dlya pri\-da\-ni\-ya ide\-n\-ti\-fi\-ka\-c\-io\-n\-nym
ma\-r\-ke\-ram kra\-si\-vo\-go vi\-da po\-t\-re\-bu\-yut\-s\-ya
ni\-zhe\-s\-le\-du\-yu\-shch\-ie si\-m\-vo\-ly, to oni mo\-gut
byt{\cprime} za\-da\-ny s po\-moshch{\cprime}\-yu ob\-ra\-t\-no{\u i}
ko\-so{\u i} che\-r\-ty.}

\begin{tabular}{ll}
{\cyr si\-m\-vol} & {\cyr pre\-d\-s\-ta\-v\-le\-n\-ie}\\
tab & $\backslash$t\\
ne\-w\-li\-ne & $\backslash$n\\
spa\-ce & $\backslash$040\\
\$ & $\backslash$044\\
$\backslash$ & $\backslash$$\backslash$
\end{tabular}

{\cyr SM. TA\-K\-ZHE}

rcsintro(1), rlog(1), rcsfile(5),

ci(1), co(1), rcs(1), rcsdiff(1), rcsmerge(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

Copyright (C) Walter F. Tichy, Paul Eggert.


\chapter{RCSCLEAN(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rcsclean - {\cyr chi\-s\-t\-ka ka\-ta\-lo\-ga s ra\-bo\-chi\-mi fa{\u
i}\-la\-mi v si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}}
RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

rcsclean $[${\cyr fla\-gi$]$ $[$im\-ya-fa{\u i}\-la ... $]$

OPI\-SA\-N\-IE

Ko\-ma\-n\-da} rcsclean {\cyr uda\-l\-yaet iz te\-ku\-shche\-go
ka\-ta\-lo\-ga ra\-bo\-ch\-ie fa{\u i}\-ly, nad ko\-to\-r\-y\-mi ne
ve\-det\-s\-ya ra\-bo\-ta (ko\-to\-r\-ye ne za\-b\-ro\-ni\-ro\-va\-ny
dlya vne\-se\-ni\-ya iz\-me\-ne\-ni{\u i} ni\-kem). Ko\-ma\-n\-da}
rcsclean -u {\cyr uda\-l\-yaet i ot\-me\-n\-yaet bro\-ni\-ro\-va\-n\-ie
tekh fa{\u i}\-lov, ko\-to\-r\-ye ne byli iz\-me\-ne\-ny
fa\-k\-ti\-che\-s\-ki.

Dlya ka\-zh\-do\-go za\-da\-n\-no\-go fa{\u i}\-la, ko\-ma\-n\-da}
rcsclean {\cyr sra\-v\-ni\-v\-aet ra\-bo\-chi{\u i} fa{\u i}l s
za\-b\-ro\-ni\-ro\-va\-n\-no{\u i} ve\-r\-s\-ie{\u i}
ar\-khi\-v\-no\-go fa{\u i}\-la. Es\-li oni ot\-li\-cha\-yut\-s\-ya, to
ni\-che\-go ne pro\-i\-s\-kho\-dit. V pro\-ti\-v\-nom slu\-ch\-ae, pri
na\-li\-ch\-ii fla\-ga} -u {\cyr ot\-me\-n\-yaet\-s\-ya
bro\-ni\-ro\-va\-n\-ie, i, es\-li fa{\u i}l ne ya\-v\-l\-yaet\-s\-ya
od\-no\-v\-re\-me\-n\-no bro\-ni\-ro\-va\-n\-nym i otkrytym dlya
za\-pi\-si (so\-che\-ta\-n\-ie, kha\-ra\-k\-te\-r\-n\-oe dlya
vo\-s\-t\-re\-bo\-va\-ni\-ya s cel{\cprime}\-yu vne\-se\-ni\-ya
iz\-me\-ne\-ni{\u i}), on uda\-l\-yaet\-s\-ya. O vsekh svoikh de{\u
i}\-stvi\-yakh ko\-ma\-n\-da} rcsclean {\cyr po\-s\-y\-l\-aet
so\-o\-b\-shche\-ni\-ya na sta\-n\-da\-r\-tny{\u i} vyvod
vyzyva\-e\-m\-ye} rcs -u ({\cyr o snya\-t\-ii bro\-ni) i} rm -f ({\cyr
ob uda\-le\-n\-ii).

So\-o\-t\-vet\-s\-t\-v\-ie me\-zh\-du ime\-na\-mi ra\-bo\-chikh i
ar\-khi\-v\-nykh fa{\u i}\-lov opi\-sa\-no v} ci(1){\cyr . Es\-li
ime\-na fa{\u i}\-lov ne za\-da\-ny, ope\-ra\-ci\-ya
pri\-me\-n\-yaet\-s\-ya k te\-ku\-shche\-mu ka\-ta\-lo\-gu.

Dlya fla\-gov} -n, -q, -r {\cyr i} -u {\cyr mo\-zh\-no
uka\-z\-y\-vat{\cprime} no\-mer ve\-r\-s\-ii. Es\-li s fla\-gom} -u
{\cyr no\-mer ve\-r\-s\-ii ne za\-dan, no vyzyva\-yu\-shchi{\u i}
za\-b\-ro\-ni\-ro\-val edi\-n\-s\-t\-ve\-n\-nu\-yu ve\-r\-si\-yu, ona i
im\-eet\-s\-ya vvi\-du. V os\-tal{\cprime}\-nykh slu\-cha\-yakh
is\-pol{\cprime}\-z\-uet\-s\-ya po\-s\-le\-d\-n\-ya\-ya iz ve\-r\-s\-ii
na ve\-t\-vi, is\-pol{\cprime}\-zu\-e\-mo{\u i} po umo\-l\-cha\-ni\-yu,
ob\-ychno, gla\-v\-no{\u i}.

Ko\-ma\-n\-da} rcsclean {\cyr udo\-b\-na dlya po\-s\-t\-ro\-e\-ni\-ya s
ko\-ma\-n\-do{\u i}} ma\-ke(1) {\cyr ta\-kikh ob{\cdprime}ek\-tov, kak}
clean ({\cyr pro\-shche go\-vo\-r\-ya, ochi\-s\-t\-ki po\-s\-le
oko\-n\-cha\-ni\-ya ra\-bo\-ty). Al{\cprime}\-te\-r\-na\-ti\-vo{\u i} v
\`etom slu\-ch\-ae mo\-gut byt{\cprime} ko\-ma\-n\-dy} rcsdiff(1){\cyr
, op\-re\-de\-l\-ya\-yu\-shchu\-yu iz\-me\-ne\-ni\-ya, i} ci(1){\cyr ,
ko\-to\-ra\-ya ve\-r\-net na\-zad pre\-d\-y\-du\-shchu\-yu
ve\-r\-si\-yu, es\-li fa{\u i}l ne iz\-me\-ni\-l\-s\-ya.

FLA\-GI}

-ksubst

{\cyr Us\-ta\-na\-v\-li\-v\-aet pra\-vi\-la po\-d\-s\-ta\-no\-v\-ki
klyu\-che\-vykh si\-m\-vo\-lov pri iz\-vle\-che\-n\-ii dlya
sra\-v\-ne\-ni\-ya. Vo\-z\-mo\-zh\-n\-ye pra\-vi\-la} subst {\cyr
opi\-sa\-ny v} co(1){\cyr . Ya\-v\-n\-oe za\-da\-n\-ie fla\-ga} -k
{\cyr po\-da\-vit za\-da\-n\-n\-oe po umo\-l\-cha\-ni\-yu
zna\-che\-n\-ie.}

-n$[$rev$]$

{\cyr Ne uda\-l\-yat{\cprime} fa{\u i}\-ly i ne sni\-mat{\cprime}
bron{\cprime} s ve\-r\-si{\u i}, no so\-o\-b\-shchit{\cprime} o
tre\-b\-ue\-mykh de{\u i}\-stvi\-yakh.}

-q$[$rev$]$

{\cyr Ne pe\-cha\-tat{\cprime} ni\-ka\-kikh so\-o\-b\-shche\-ni{\u i}.}

-r$[$rev$]$

{\cyr Za\-d\-aet ve\-r\-si\-yu dlya sra\-v\-ne\-ni\-ya s ra\-bo\-chim
fa{\u i}\-lom.}

-T

{\cyr So\-kh\-ra\-n\-yaet da\-tu i vre\-m\-ya po\-s\-le\-d\-ne\-go
iz\-me\-ne\-ni\-ya ra\-bo\-che\-go fa{\u i}\-la da\-zhe es\-li v nem
byla snya\-ta bron{\cprime} i iz\-me\-ne\-ny zna\-che\-ni\-ya
klyu\-che\-vykh si\-m\-vo\-lov. Ta\-k\-oe po\-ve\-de\-n\-ie fla\-ga
vvo\-dit v za\-b\-lu\-zh\-de\-ni\-yu ko\-ma\-n\-du} ma\-ke(1) {\cyr i,
po\-to\-mu ne\-o\-b\-kho\-di\-ma os\-to\-ro\-zh\-nost{\cprime}. Flag}
-T {\cyr po\-z\-vo\-l\-yaet iz\-be\-zhat{\cprime} ne\-nu\-zhnykh
po\-s\-t\-ro\-e\-ni{\u i} (ko\-m\-pi\-l\-ya\-ci{\u i}), no ona mo\-zhet
po\-da\-vit{\cprime} ikh i to\-g\-da, ko\-g\-da iz\-me\-ne\-n\-ie
ide\-n\-ti\-fi\-ka\-c\-io\-n\-nykh ma\-r\-ke\-rov
su\-shche\-s\-t\-ve\-no dlya re\-zul{\cprime}\-ta\-ta
po\-s\-t\-ro\-e\-ni\-ya.}

-u$[$rev$]$

{\cyr Snyat{\cprime} bro\-ni\-ro\-va\-n\-ie ve\-r\-s\-ii, es\-li ona ne
ot\-li\-ch\-aet\-s\-ya ot ra\-bo\-che\-go fa{\u i}\-la.}

-V

{\cyr Po\-s\-y\-l\-aet no\-mer ve\-r\-s\-ii} RCS {\cyr na
sta\-n\-da\-r\-tny{\u i} vyvod.}

-Vn

{\cyr Imi\-ti\-r\-uet po\-ve\-de\-n\-ie ve\-r\-s\-ii} n {\cyr
ko\-m\-p\-le\-k\-sa pro\-g\-ramm} RCS . {\cyr Sm.} co(1) .

-xsuffixes

{\cyr Za\-d\-aet su\-f\-fiks, do\-ba\-v\-l\-ya\-e\-my{\u i} k ime\-ni
ar\-khi\-v\-no\-go fa{\u i}\-la. Sm.} ci(1) .

-zzone

{\cyr Za\-d\-aet fo\-r\-mat da\-ty i cha\-so\-vo{\u i} po\-yas pri
po\-d\-s\-ta\-no\-v\-ke klyu\-che\-vykh slov v ma\-r\-ke\-ry. Sm.}
co(1) .

{\cyr PRI\-ME\-RY}

rcsclean $\star$.c $\star$.h

{\cyr Uda\-lit{\cprime} vse ra\-bo\-ch\-ie fa{\u i}\-ly s
ra\-s\-shi\-re\-ni\-ya\-mi .}c {\cyr i .}h {\cyr , ko\-to\-r\-ye ne
byli iz\-me\-ne\-ny so vre\-me\-ni svo\-e\-go
vo\-s\-t\-re\-bo\-va\-ni\-ya.}

rcsclean

{\cyr Uda\-lit{\cprime} vse ra\-bo\-ch\-ie fa{\u i}\-ly v
te\-ku\-shchem ka\-ta\-lo\-ge, ko\-to\-r\-ye ne byli iz\-me\-ne\-ny so
vre\-me\-ni svo\-e\-go vo\-s\-t\-re\-bo\-va\-ni\-ya.

FA{\u I}\-LY

Ko\-ma\-n\-da} rcs {\cyr ra\-bo\-t\-aet s fa{\u i}\-la\-mi tak zhe, kak
ko\-ma\-n\-da} ci(1) .

{\cyr PE\-RE\-ME\-N\-N\-YE SRE\-DY}

RCSI\-NIT

{\cyr Spi\-sok fla\-gov is\-pol{\cprime}\-z\-ue\-mykh so vse\-mi
ko\-ma\-n\-da\-mi si\-s\-te\-my ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u
i}} RCS{\cyr . Ne za\-bud{\cprime}\-te, chto ne\-o\-b\-kho\-di\-my
me\-ry dlya to\-go, chto\-by pro\-be\-ly me\-zh\-du fla\-ga\-mi ne byli
ob\-ra\-bo\-ta\-ny ko\-ma\-n\-dnym in\-te\-r\-p\-re\-ta\-to\-rom
pre\-zh\-de\-v\-re\-me\-n\-no, za\-shchi\-shcha{\u i}\-te ikh,
na\-p\-ri\-mer, ka\-v\-y\-ch\-ka\-mi. Sm.} ci(1) . {\cyr
Po\-le\-z\-n\-y\-mi op\-ci\-ya\-mi mo\-gut byt{\cprime}} -q, -V, -x
{\cyr i} -z .

{\cyr SO\-O\-B\-shchE\-NI\-Ya

Vo\-z\-v\-ra\-shch\-aet ope\-ra\-ci\-o\-n\-no{\u i} si\-s\-te\-me 0
to\-g\-da i tol{\cprime}\-ko to\-g\-da, ko\-g\-da vse ope\-ra\-c\-ii
za\-ve\-r\-shi\-lis{\cprime} us\-pe\-sh\-no.
Ot\-sut\-s\-t\-vu\-yu\-shch\-ie fa{\u i}\-ly ig\-no\-ri\-ru\-yut\-s\-ya
bez so\-o\-b\-shche\-ni{\u i}.

SM. TA\-K\-ZHE}

rcsintro(1), co(1), rcsfile(5),

ci(1), ident(1), rcs(1), rcsdiff(1), rcsmerge(1), rlog(1)

Walter F. Tichy, RCS--A System for Version Control, Software-\\
Practice \& Experience 15, 7 (July 1985), 637-654.

{\cyr PRO\-B\-LE\-MY

Dlya sta\-rykh ve\-r\-si{\u i}} UNIX {\cyr tre\-b\-uet\-s\-ya
za\-da\-n\-ie po kra{\u i}\-ne{\u i} me\-re od\-no\-go fa{\u i}\-la.}

\chapter{RCSFREEZE(1)}

~

{\cyr NA\-Z\-VA\-N\-IE}

rcsfreeze - {\cyr fi\-k\-sa\-ci\-ya so\-s\-to\-ya\-ni\-ya pro\-e\-k\-ta
dlya po\-s\-le\-du\-yu\-shche\-go vo\-s\-p\-ro\-i\-z\-ve\-de\-ni\-ya v
si\-s\-te\-me ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS

{\cyr FO\-R\-MAT KO\-MA\-N\-DY}

rcsfreeze $[${\cyr si\-m\-vo\-li\-che\-s\-k\-oe-im\-ya$]$

OPI\-SA\-N\-IE

Ko\-ma\-n\-dny{\u i} fa{\u i}l} rcsfreeze {\cyr pri\-s\-va\-i\-v\-aet
si\-m\-vo\-li\-che\-s\-k\-oe im\-ya ve\-r\-si\-yam,
ob\-ra\-zu\-yu\-shchim te\-ku\-shchu\-yu ko\-n\-fi\-gu\-ra\-ci\-yu
pro\-e\-k\-ta.

Na\-chal{\cprime}\-na\-ya ide\-ya byla vyzyvat{\cprime}} rcsfreeze
{\cyr ka\-zhdy{\u i} raz pri re\-gi\-s\-t\-ra\-c\-ii oche\-re\-d\-no{\u
i} ve\-r\-s\-ii oche\-re\-d\-no\-go fa{\u i}\-la. Pri \`etom
po\-s\-le\-do\-va\-tel{\cprime}\-nym so\-s\-to\-ya\-ni\-yam
pro\-e\-k\-ta pri\-s\-va\-i\-v\-aet\-s\-ya si\-m\-vo\-li\-che\-s\-k\-oe
im\-ya} C\_nu\-m\-ber{\cyr , gde} nu\-m\-ber {\cyr -- no\-mer,
ko\-to\-ry{\u i} vo\-z\-ra\-s\-t\-aet pri ka\-zh\-dom vyzo\-ve}
rcsfreeze {\cyr , svya\-z\-y\-v\-aet\-s\-ya s po\-s\-le\-d\-ne{\u i}
ve\-r\-s\-ie{\u i} gla\-v\-no{\u i} ve\-t\-vi ka\-zh\-do\-go fa{\u
i}\-la.

Do\-po\-l\-ni\-tel{\cprime}\-ny{\u i} ar\-gu\-ment za\-d\-aet
si\-m\-vo\-li\-che\-s\-k\-oe im\-ya dlya ko\-n\-fi\-gu\-ra\-c\-ii, no
ne ot\-me\-n\-yaet po\-ro\-zh\-de\-ni\-ya} C\_nu\-m\-ber{\cyr ,
ko\-to\-r\-oe fi\-k\-si\-r\-uet\-s\-ya v
re\-gi\-s\-t\-ra\-ci\-o\-n\-nom fa{\u i}\-le, no ne vno\-sit\-s\-ya v
ar\-khi\-v\-n\-ye fa{\u i}\-ly.

Pol{\cprime}\-zo\-va\-te\-l\-yu pre\-d\-la\-g\-aet\-s\-ya vne\-s\-ti
re\-gi\-s\-t\-ra\-ci\-o\-n\-nu\-yu za\-pis{\cprime} v
spe\-c\-ial{\cprime}\-ny{\u i} re\-gi\-s\-t\-ra\-c\-io\-n\-ny{\u i}
fa{\u i}l.

Ko\-ma\-n\-dny{\u i} fa{\u i}l ra\-bo\-t\-aet tol{\cprime}\-ko so
vse\-mi fa{\u i}\-la\-mi pro\-e\-k\-ta od\-no\-v\-re\-me\-n\-no. Vse
iz\-me\-ne\-ni\-ya do\-l\-zhny byt{\cprime}
za\-re\-gi\-s\-t\-ri\-ro\-va\-ny. Dlya pro\-ve\-r\-ki udo\-b\-no
is\-pol{\cprime}\-zo\-vat{\cprime} ko\-to\-ra\-ya} rcsclean(1) , {\cyr
ko\-to\-ra\-ya ne do\-l\-zh\-na os\-ta\-vit{\cprime} ni od\-no\-go
ra\-bo\-che\-go fa{\u i}\-la.

FA{\u I}\-LY}

RCS/.rcsfreeze.ver {\cyr -- no\-mer ve\-r\-s\-ii}

RCS/.rcsfreeze.log {\cyr -- re\-gi\-s\-t\-ra\-ci\-o\-n\-n\-ye
za\-pi\-si v ob\-ra\-t\-nom po\-r\-ya\-d\-ke

AV\-TOR}

Ste\-p\-han v. Be\-ch\-to\-l\-sh\-eim

{\cyr SM. TA\-K\-ZHE}

co(1), rcs(1), rcsclean(1), rlog(1)

{\cyr PRO\-B\-LE\-MY}

rcsfreeze {\cyr ne pro\-ve\-r\-yaet, iz\-me\-ne\-ny li i
vo\-s\-t\-re\-bo\-va\-ny li ve\-r\-s\-ii.

So\-o\-t\-vet\-s\-t\-v\-ie imen ra\-bo\-chikh i ar\-khi\-v\-nykh fa{\u
i}\-lov ot\-li\-ch\-aet\-s\-ya ot ko\-mand v si\-s\-te\-me
ot\-s\-le\-zhi\-va\-ni\-ya ve\-r\-si{\u i}} RCS

{\cyr Pro\-ve\-r\-ka oshi\-bok ne ra\-z\-vi\-ta.}

rcsfreeze {\cyr vse\-go lish{\cprime} pri\-mer ko\-ma\-n\-d\-no\-go
fa{\u i}\-la il\-lyu\-s\-t\-ri\-ru\-yu\-shchi{\u i} pri\-me\-ne\-n\-ie}
RCS{\cyr . Te zhe za\-da\-chi re\-she\-ny go\-ra\-z\-do
ser{\cprime}\-e\-z\-n\-ee v pa\-ke\-te} CVS.

\tableofcontents
\end{document}
