@dircategory óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ * cvs-ru: (cvs-ru). óÉÓÔÅÍÁ õÐÒÁ×ÌÅÎÉÑ ðÁÒÁÌÌÅÌØÎÙÍÉ ÷ÅÒÓÉÑÍÉ
õÐÒÁ×ÌÅÎÉÅ ×ÅÒÓÉÑÍÉ Ó ÐÏÍÏÝØÀ CVS ÄÌÑ CVS 1.10.8 Per Cederqvist et al ðÅÒÅ×ÏÄ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË -- áÌÅËÓÅÊ íÁÈÏÔËÉÎ
Copyright (C) 1992, 1993 Signum Support AB
Copyright (C) 1999-2001 Alexey Mahotkin (translation into Russian)
Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies.
Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided also that the entire resulting derived work is distributed under the terms of a permission notice identical to this one.
Permission is granted to copy and distribute translations of this manual into another language, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation.
ðÅÒÅ×ÏÄ ÔÏÇÏ ÖÅ ÓÁÍÏÇÏ Õ×ÅÄÏÍÌÅÎÉÑ ÎÁ ÒÕÓÓËÉÊ ÑÚÙË (ÐÅÒÅ×ÏÄ, × ÏÔÌÉÞÉÅ ÏÔ Õ×ÅÄÏÍÌÅÎÉÑ ÎÁ ÁÎÇÌÉÊÓËÏÍ ÑÚÙËÅ, ÚÁËÏÎÎÏÊ ÓÉÌÙ ÎÅ ÉÍÅÅÔ):
òÁÚÒÅÛÁÅÔÓÑ ÓÏÚÄÁ×ÁÔØ É ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÎÅÉÚÍÅÎÅÎÎÙÅ ËÏÐÉÉ ÜÔÏÇÏ ÒÕËÏ×ÏÄÓÔ×Á, ÐÒÉ ÕÓÌÏ×ÉÉ, ÞÔÏ ÎÁ ×ÓÅÈ ËÏÐÉÑÈ ÓÏÈÒÁÎÑÅÔÓÑ Õ×ÅÄÏÍÌÅÎÉÅ Ï ËÏÐÉÒÁÊÔÅ É ÜÔÏ ÒÁÚÒÅÛÅÎÉÅ Ï ÉÓÐÏÌØÚÏ×ÁÎÉÉ.
òÁÚÒÅÛÁÅÔÓÑ ËÏÐÉÒÏ×ÁÔØ É ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÉÚÍÅÎÅÎÎÙÅ ×ÅÒÓÉÉ ÜÔÏÇÏ ÒÕËÏ×ÏÄÓÔ×Á ÎÁ ÕÓÌÏ×ÉÑÈ ËÏÐÉÒÏ×ÁÎÉÑ ÂÅÚ ÉÚÍÅÎÅÎÉÊ, Á ÔÁËÖÅ ÐÒÉ ÕÓÌÏ×ÉÉ, ÞÔÏ ×ÓÑ ÐÏÒÏÖÄÅÎÎÁÑ ÒÁÂÏÔÁ ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ Ó ÒÁÚÒÅÛÅÎÉÅÍ ÉÓÐÏÌØÚÏ×ÁÎÉÑ, ÉÄÅÎÔÉÞÎÏÍÕ ÜÔÏÍÕ ÒÁÚÒÅÛÅÎÉÀ.
òÁÚÒÅÛÁÅÔÓÑ ËÏÐÉÒÏ×ÁÔØ É ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÐÅÒÅ×ÏÄÙ ÜÔÏÇÏ ÒÕËÏ×ÏÄÓÔ×Á ÎÁ ÄÒÕÇÏÊ ÑÚÙË, Ó ÔÏÞÎÏ ÔÁËÉÍÉ ÖÅ ÕÓÌÏ×ÉÑÍÉ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÉÚÍÅÎÅÎÎÙÈ ×ÅÒÓÉÊ, ÚÁ ÉÓËÌÀÞÅÎÉÅÍ ÔÏÇÏ, ÞÔÏ ÜÔÏ ÒÁÚÒÅÛÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÐÅÒÅ×ÅÄÅÎÏ, Á ÐÅÒÅ×ÏÄ ÄÏÌÖÅÎ ÂÙÔØ ÏÄÏÂÒÅÎ æÏÎÄÏÍ ó×ÏÂÏÄÎÏÇÏ ðÒÏÇÒÁÍÍÎÏÇÏ ïÂÅÓÐÅÞÅÎÉÑ.
@macro cvsver{ver} CVS \ver\
üÔÁ ÇÌÁ×Á ÐÒÅÄÎÁÚÎÁÞÅÎÁ ÄÌÑ ÌÀÄÅÊ, ÎÉËÏÇÄÁ ÒÁÎÅÅ ÎÅ ÉÓÐÏÌØÚÏ×Á×ÛÉÈ CVS É, ×ÏÚÍÏÖÎÏ, ÎÉËÏÇÄÁ ÎÅ ÉÓÐÏÌØÚÏ×Á×ÛÉÈ ÕÐÒÁ×ÌÅÎÉÅ ×ÅÒÓÉÑÍÉ.
åÓÌÉ ×Ù ÕÖÅ ÚÎÁËÏÍÙ Ó CVS É ÐÒÏÓÔÏ ÈÏÔÉÔÅ ÉÚÕÞÉÔØ ËÏÎËÒÅÔÎÕÀ ×ÏÚÍÏÖÎÏÓÔØ ÉÌÉ ×ÓÐÏÍÎÉÔØ ÏÐÒÅÄÅÌÅÎÎÕÀ ËÏÍÁÎÄÕ, ×Ù, ×ÅÒÏÑÔÎÏ, ÍÏÖÅÔÅ ÐÒÏÐÕÓÔÉÔØ ×ÓÀ ÇÌÁ×Õ.
îÅ ÐÏÍÎÑÝÉÅ ÐÒÏÛÌÏÇÏ ÏÂÒÅÞÅÎÙ ÐÏ×ÔÏÒÑÔØ ÅÇÏ. -- äÖÏÒÄÖ óÁÎÔÁÑÎÁ
CVS -- ÜÔÏ ÓÉÓÔÅÍÁ ËÏÎÔÒÏÌÑ ×ÅÒÓÉÊ. éÓÐÏÌØÚÕÑ ÅÅ, ×Ù ÍÏÖÅÔÅ ×ÅÓÔÉ ÉÓÔÏÒÉÀ ×ÁÛÉÈ ÆÁÊÌÏ× Ó ÉÓÈÏÄÎÙÍÉ ÔÅËÓÔÁÍÉ.
îÁÐÒÉÍÅÒ, ÉÎÏÇÄÁ ÐÒÉ ÏÐÒÅÄÅÌÅÎÎÏÍ ÉÚÍÅÎÅÎÉÉ × ËÏÄÅ ÍÏÇÕÔ ÐÏÑ×ÉÔØÓÑ ÏÛÉÂËÉ, ËÏÔÏÒÙÅ ×Ù ÎÅ ÓÍÏÖÅÔÅ ÏÂÎÁÒÕÖÉÔØ × ÔÅÞÅÎÉÅ ÄÌÉÔÅÌØÎÏÇÏ ×ÒÅÍÅÎÉ. ó ÐÏÍÏÝØÀ CVS ×Ù ÌÅÇËÏ ÍÏÖÅÔÅ ÏÂÒÁÔÉÔØÓÑ Ë ÓÔÁÒÙÍ ×ÅÒÓÉÑÍ, ÞÔÏÂÙ ÔÏÞÎÏ ×ÙÑÓÎÉÔØ, ÞÔÏ ÉÍÅÎÎÏ ÐÒÉ×ÅÌÏ Ë ÏÛÉÂËÅ. éÎÏÇÄÁ ÜÔÏ ÓÉÌØÎÏ ÐÏÍÏÇÁÅÔ.
ëÏÎÅÞÎÏ, ×Ù ÍÏÖÅÔÅ ÈÒÁÎÉÔØ ËÁÖÄÕÀ ×ÅÒÓÉÀ ËÁÖÄÏÇÏ ÆÁÊÌÁ, ËÏÔÏÒÙÅ ×Ù ÓÏÚÄÁÅÔÅ. üÔÏ ÂÕÄÅÔ ÓÔÏÉÔØ ×ÁÍ ÎÅ×ÅÒÏÑÔÎÏÇÏ ÏÂßÅÍÁ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÒÁÎÓÔ×Á. CVS ÈÒÁÎÉÔ ×ÓÅ ×ÅÒÓÉÉ ÆÁÊÌÁ × ÏÄÎÏÍ ÆÁÊÌÅ ÔÁËÉÍ ÏÂÒÁÚÏÍ, ÞÔÏ ÚÁÐÏÍÉÎÁÀÔÓÑ ÌÉÛØ ÉÚÍÅÎÅÎÉÑ ÍÅÖÄÕ ×ÅÒÓÉÑÍÉ.
CVS ÔÁËÖÅ ÐÏÍÏÖÅÔ, ÅÓÌÉ ×Ù Ñ×ÌÑÅÔÅÓØ ÞÌÅÎÏÍ ÇÒÕÐÐÙ ÒÁÚÒÁÂÏÔÞÉËÏ× ÏÄÎÏÇÏ ÐÒÏÅËÔÁ. ïÞÅÎØ ÌÅÇËÏ ÐÏÐÏÒÔÉÔØ ÞÕÖÉÅ ÉÚÍÅÎÅÎÉÑ, ÅÓÌÉ ÔÏÌØËÏ ×Ù ÎÅ ËÒÁÊÎÅ ÁËËÕÒÁÔÎÙ. îÅËÏÔÏÒÙÅ ÒÅÄÁËÔÏÒÙ, ÔÁËÉÅ ËÁË GNU Emacs, ÓÔÁÒÁÀÔÓÑ ÐÒÏÓÌÅÄÉÔØ, ÞÔÏÂÙ Ä×Á ÞÅÌÏ×ÅËÁ ÎÅ ÉÚÍÅÎÑÌÉ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÏÄÉÎ É ÔÏÔ ÖÅ ÆÁÊÌ. ë ÓÏÖÁÌÅÎÉÀ, ÅÓÌÉ ËÔÏ-ÔÏ ÉÓÐÏÌØÚÕÅÔ ÄÒÕÇÏÊ ÒÅÄÁËÔÏÒ, ÜÔÁ ÐÒÅÄÏÓÔÏÒÏÖÎÏÓÔØ ÎÅ ÓÒÁÂÏÔÁÅÔ. CVS ÒÅÛÁÅÔ ÜÔÕ ÐÒÏÂÌÅÍÕ, ÉÚÏÌÉÒÕÑ ÒÁÚÒÁÂÏÔÞÉËÏ× ÄÒÕÇ ÏÔ ÄÒÕÇÁ. ëÁÖÄÙÊ ÒÁÂÏÔÁÅÔ × Ó×ÏÅÍ ÓÏÂÓÔ×ÅÎÎÏÍ ËÁÔÁÌÏÇÅ, Á ÚÁÔÅÍ CVS ÏÂßÅÄÉÎÑÅÔ ÚÁËÏÎÞÅÎÎÙÅ ÒÁÂÏÔÙ.
CVS ÐÏÑ×ÉÌÓÑ ÉÚ ÎÁÂÏÒÁ sh-ÓËÒÉÐÔÏ×, Á×ÔÏÒÏÍ ËÏÔÏÒÙÈ ÂÙÌ Dick
Grune, ÏÐÕÂÌÉËÏ×ÁÎÎÙÈ × ÇÒÕÐÐÅ ÎÏ×ÏÓÔÅÊ comp.sources.unix
× ÔÏÍÅ 6 × ÄÅËÁÂÒÅ 1986 ÇÏÄÁ. îÅÓÍÏÔÒÑ ÎÁ ÔÏ, ÞÔÏ ÎÉ ÓÔÒÏÞËÉ
ËÏÄÁ ÉÚ ÔÅÈ ÓËÒÉÐÔÏ× ÎÅ ÐÒÉÓÕÔÓÔ×ÕÅÔ × CVS, ÏÓÎÏ×Ù ÁÌÇÏÒÉÔÍÁ
ÕÓÔÒÁÎÅÎÉÑ ËÏÎÆÌÉËÔÏ× ×ÚÑÔÙ ÉÍÅÎÎÏ ÏÔÔÕÄÁ.
÷ ÁÐÒÅÌÅ 1989 ÇÏÄÁ Brian Berliner ÓÐÒÏÅËÔÉÒÏ×ÁÌ É ÒÅÁÌÉÚÏ×ÁÌ CVS. Jeff Polk ÐÏÚÄÎÅÅ ÐÏÍÏÇ ÅÍÕ Ó ÐÏÄÄÅÒÖËÏÊ ÍÏÄÕÌÅÊ É ×ÅÔ×ÅÊ ÐÏÓÔÁ×ÝÉËÁ.
ðÏÌÕÞÉÔØ CVS ÍÏÖÎÏ ÒÁÚÎÙÍÉ ÓÐÏÓÏÂÁÍÉ, ×ËÌÀÞÁÑ Ó×ÏÂÏÄÎÏÅ ÐÏÌÕÞÅÎÉÅ × éÎÔÅÒÎÅÔÅ. úÁ ÉÎÆÏÒÍÁÃÉÅÊ Ï ÐÏÌÕÞÅÎÉÉ É ÐÏ ÄÒÕÇÉÍ ×ÏÐÒÏÓÁÍ ÏÂÒÁÝÁÊÔÅÓØ ÎÁ:
http://www.cyclic.com/ http://www.loria.fr/~molli/cvs-index.html
éÍÅÅÔÓÑ ÓÐÉÓÏË ÒÁÓÓÙÌËÉ info-cvs
, ÐÏÓ×ÑÝÅÎÎÙÊ ÏÂÓÕÖÄÅÎÉÀ
CVS. þÔÏÂÙ ÐÏÄÐÉÓÁÔØÓÑ ÎÁ ÎÅÇÏ ÉÌÉ ÏÔÐÉÓÁÔØÓÑ, ÐÉÛÉÔÅ ÎÁ
info-cvs-request@gnu.org
.
åÓÌÉ ×Ù ÐÒÅÄÐÏÞÉÔÁÅÔÅ ÇÒÕÐÐÙ ÎÏ×ÏÓÔÅÊ usenet, ÎÁÊÄÉÔÅ
comp.software.config-mgmt
, ÐÏÓ×ÑÝÅÎÎÕÀ ÏÂÓÕÖÄÅÎÉÀ
ÒÁÚÎÏÏÂÒÁÚÎÙÈ ÓÉÓÔÅÍ ÕÐÒÁ×ÌÅÎÉÑ ËÏÎÆÉÇÕÒÁÃÉÅÊ, ÎÅ ÔÏÌØËÏ
CVS. ÷ ÂÕÄÕÝÅÍ ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÎÉÅ
comp.software.config-mgmt.cvs
, ÅÓÌÉ ×
comp.software.config-mgmt
ÂÕÄÅÔ ÎÁÌÉÞÅÓÔ×Ï×ÁÔØ ÄÏÓÔÁÔÏÞÎÏÅ
ËÏÌÉÞÅÓÔ×Ï ÏÂÓÕÖÄÅÎÉÊ CVS.
íÏÖÎÏ ÔÁËÖÅ ÐÏÄÐÉÓÁÔØÓÑ ÎÁ ÓÐÉÓÏË ÒÁÓÓÙÌËÉ bug-cvs
, Ï
ËÏÔÏÒÏÍ ÐÏÄÒÏÂÎÏ ÒÁÓÓËÁÚÙ×ÁÅÔÓÑ × section þÔÏ ÄÅÌÁÔØ Ó ÏÛÉÂËÁÍÉ × CVS É ÜÔÏÍ ÒÕËÏ×ÏÄÓÔ×Å?. þÔÏÂÙ
ÐÏÄÐÉÓÁÔØÓÑ, ÎÁÐÉÛÉÔÅ ÎÁ bug-cvs-request@gnu.org
.
CVS ÓÄÅÌÁÅÔ ÄÌÑ ×ÁÓ ÍÎÏÖÅÓÔ×Ï ×ÅÝÅÊ, ÎÏ ÎÅ ÐÙÔÁÅÔÓÑ ÂÙÔØ ×ÓÅÍ ÓÒÁÚÕ.
VPATH
× `Makefile''ÁÈ É Ô. Ä.), ÔÏ
ÓÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï ÌÀÂÙÍ ÕÇÏÄÎÙÍ ×ÁÍ
ÓÐÏÓÏÂÏÍ.
ðÏÍÎÉÔÅ ÔÏÌØËÏ, ÞÔÏ ÌÀÂÁÑ ÐÏÄÏÂÎÁÑ ÓÉÓÔÅÍÁ ÔÒÅÂÕÅÔ
ÓÅÒØÅÚÎÏÊ ÒÁÂÏÔÙ ÐÏ ÓÏÚÄÁÎÉÀ É ÐÏÄÄÅÒÖÁÎÉÀ. CVS ÎÅ ÐÙÔÁÅÔÓÑ
ÓÐÒÁ×ÉÔØÓÑ Ó ×ÏÚÎÉËÁÀÝÉÍÉ ÐÒÉ ÜÔÏÍ ×ÏÐÒÏÓÁÍÉ.
ëÏÎÅÞÎÏ ÖÅ, ×ÁÍ ÓÌÅÄÕÅÔ ÐÏÍÅÓÔÉÔØ ÓÒÅÄÓÔ×Á, ÓÏÚÄÁÎÎÙÅ ÄÌÑ
ÐÏÄÄÅÒÖËÉ ÓÉÓÔÅÍÙ ÓÂÏÒËÉ (ÓËÒÉÐÔÙ, `Makefile''Ù, É Ô. Ä.),
ÐÏÄ CVS.
÷ÙÑÓÎÅÎÉÅ ÔÏÇÏ, ËÁËÉÅ ÆÁÊÌÙ ÓÌÅÄÕÅÔ ÐÅÒÅËÏÍÐÉÌÉÒÏ×ÁÔØ ÐÒÉ
ËÁËÏÍ-ÌÉÂÏ ÉÚÍÅÎÅÎÉÉ, ÏÐÑÔØ ÖÅ, ÎÅ Ñ×ÌÑÅÔÓÑ ÚÁÄÁÞÅÊ CVS.
ôÒÁÄÉÃÉÏÎÎÙÍ ÐÏÄÈÏÄÏÍ Ñ×ÌÑÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÎÉÅ make
ÄÌÑ
ÓÂÏÒËÉ, É ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÓÐÅÃÉÁÌØÎÏÊ ÕÔÉÌÉÔÙ ÄÌÑ ÇÅÎÅÒÁÃÉÉ
ÚÁ×ÉÓÉÍÏÓÔÅÊ, ÉÓÐÏÌØÚÕÅÍÙÈ ÐÒÏÇÒÁÍÍÏÊ make
.
äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÓÂÏÒËÅ ÐÒÏÅËÔÏ× ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ
CVS ÎÁÈÏÄÉÔÓÑ × section ëÁË ×ÁÛÁ ÓÉÓÔÅÍÁ ÓÂÏÒËÉ ×ÚÁÉÍÏÄÅÊÓÔ×ÕÅÔ Ó CVS.
diff3
).
CVS ÓÏ×ÅÒÛÅÎÎÏ ÎÅÓÐÏÓÏÂÎÁ ÐÏÍÏÞØ × ÕÓÔÒÁÎÅÎÉÉ ÎÅÔÅËÓÔÕÁÌØÎÙÈ
ÉÌÉ ÒÁÓÐÒÅÄÅÌÅÎÎÙÈ ËÏÎÆÌÉËÔÏ× × ÌÏÇÉËÅ ÐÒÏÇÒÁÍÍÙ.
ðÒÉÍÅÒ: ÐÒÅÄÐÏÌÏÖÉÍ, ×Ù ÉÚÍÅÎÉÌÉ ÁÒÇÕÍÅÎÔÙ ÆÕÎËÃÉÉ X
,
ÏÐÉÓÁÎÎÏÊ × ÆÁÊÌÅ `A'. ÷ ÔÏ ÖÅ ÓÁÍÏÅ ×ÒÅÍÑ ËÔÏ-ÔÏ ÅÝÅ
ÒÅÄÁËÔÉÒÕÅÔ ÆÁÊÌ `B', ÄÏÂÁ×É× ÎÏ×ÙÊ ×ÙÚÏ× ÆÕÎËÃÉÉ X
,
ÉÓÐÏÌØÚÕÑ ÓÔÁÒÙÅ ÁÒÇÕÍÅÎÔÙ. CVS ÎÉÞÅÍ ÎÅ ÓÍÏÖÅÔ ÐÏÍÏÞØ.
÷ÏÚØÍÉÔÅ ÐÒÉ×ÙÞËÕ ÞÉÔÁÔØ ÓÐÅÃÉÆÉËÁÃÉÉ É ÂÅÓÅÄÏ×ÁÔØ Ó ËÏÌÌÅÇÁÍÉ.
cvs commit
, ÔÏ
CVS ÚÁÂÙ×ÁÅÔ, ÞÔÏ ÜÔÉ ÆÁÊÌÙ ÂÙÌÉ ÚÁÆÉËÓÉÒÏ×ÁÎÙ ÏÄÎÏ×ÒÅÍÅÎÎÏ,
É ÅÄÉÎÓÔ×ÅÎÎÁÑ ×ÅÝØ, ÉÈ ÏÂßÅÄÉÎÑÀÝÁÑ -- ÜÔÏ ÏÄÉÎÁËÏ×ÙÅ
ÖÕÒÎÁÌØÎÙÅ ÚÁÐÉÓÉ. ÷ ÄÁÎÎÏÍ ÓÌÕÞÁÅ ÍÏÖÅÔ ÐÏÍÏÞØ ×ÅÄÅÎÉÅ ÆÁÊÌÁ
`ChangeLog' × ÓÔÉÌÅ GNU.
åÝÅ ÏÄÎÉÍ ÁÓÐÅËÔÏÍ ËÏÎÔÒÏÌÑ ÉÚÍÅÎÅÎÉÊ, × ÎÅËÏÔÏÒÙÈ ÓÉÓÔÅÍÁÈ
Ñ×ÌÑÅÔÓÑ ×ÏÚÍÏÖÎÏÓÔØ ÏÔÓÌÅÖÉ×ÁÔØ ÓÔÁÔÕÓ ËÁÖÄÏÇÏ ÉÚÍÅÎÅÎÉÑ.
îÅËÏÔÏÒÙÅ ÉÚÍÅÎÅÎÉÑ ÂÙÌÉ ÎÁÐÉÓÁÎÙ ÒÁÚÒÁÂÏÔÞÉËÏÍ, ÎÅËÏÔÏÒÙÅ ÂÙÌÉ
ÉÚÕÞÅÎÙ ÄÒÕÇÉÍ ÒÁÚÒÁÂÏÔÞÉËÏÍ, É ÔÁË ÄÁÌÅÅ. ïÂÙÞÎÏ ÐÒÉ ÒÁÂÏÔÅ Ó
CVS × ÜÔÏÍ ÓÌÕÞÁÅ ÓÏÚÄÁÅÔÓÑ diff-ÆÁÊÌ, (ÉÓÐÏÌØÚÕÑ cvs
diff
ÉÌÉ diff
), ËÏÔÏÒÙÊ ÐÏÓÙÌÁÅÔÓÑ ÐÏ ÜÌÅËÔÒÏÎÎÏÊ ÐÏÞÔÅ
ËÏÍÕ-ÎÉÂÕÄØ, ËÔÏ ÐÏÔÏÍ ÐÒÉÍÅÎÉÔ ÜÔÏÔ diff-ÆÁÊÌ, ÉÓÐÏÌØÚÕÑ
ÐÒÏÇÒÁÍÍÕ patch
. üÔÏ ÏÞÅÎØ ÇÉÂËÏ, ÎÏ ÚÁ×ÉÓÉÔ ÏÔ ×ÎÅÛÎÉÈ
ÐÏ ÏÔÎÏÛÅÎÉÀ Ë CVS ÍÅÈÁÎÉÚÍÏ×, ÞÔÏÂÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ ÎÉÞÅÇÏ
ÎÅ ÕÐÕÝÅÎÏ.
÷ ËÁÞÅÓÔ×Å ××ÅÄÅÎÉÑ × CVS ÍÙ ÐÒÉ×ÅÄÅÍ ÚÄÅÓØ ÔÉÐÉÞÎÕÀ ÓÅÓÓÉÀ ÒÁÂÏÔÙ Ó CVS. ðÅÒ×ÏÅ, ÞÔÏ ÎÅÏÂÈÏÄÉÍÏ ÐÏÎÉÍÁÔØ, ÜÔÏ ÔÏ, ÞÔÏ CVS ÈÒÁÎÉÔ ×ÓÅ ÆÁÊÌÙ × ÃÅÎÔÒÁÌÉÚÏ×ÁÎÎÏÍ ÒÅÐÏÚÉÔÏÒÉÉ (see section òÅÐÏÚÉÔÏÒÉÊ); × ÜÔÏÊ ÇÌÁ×Å ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÒÅÐÏÚÉÔÏÒÉÊ ÎÁÓÔÒÏÅÎ.
ðÒÅÄÐÏÌÏÖÉÍ, ÞÔÏ ×Ù ÒÁÂÏÔÁÅÔÅ ÎÁÄ ÐÒÏÓÔÙÍ ËÏÍÐÉÌÑÔÏÒÏÍ. éÓÈÏÄÎÙÊ ÔÅËÓÔ ÓÏÓÔÏÉÔ ÉÚ ÎÅÓËÏÌØËÉÈ C-ÆÁÊÌÏ× É `Makefile''Á. ëÏÍÐÉÌÑÔÏÒ ÎÁÚÙ×ÁÅÔÓÑ `tc' (ôÒÉ×ÉÁÌØÎÙÊ ëÏÍÐÉÌÑÔÏÒ), Á ÒÅÐÏÚÉÔÏÒÉÊ ÎÁÓÔÒÏÅÎ ÔÁË, ÞÔÏ ÉÍÅÅÔÓÑ ÍÏÄÕÌØ `tc'.
óÎÁÞÁÌÁ ×ÁÍ ÎÁÄÏ ÐÏÌÕÞÉÔØ ÒÁÂÏÞÕÀ ËÏÐÉÀ ÉÓÈÏÄÎÏÇÏ ËÏÄÁ ÄÌÑ `tc'. éÓÐÏÌØÚÕÊÔÅ ËÏÍÁÎÄÕ
$ cvs checkout tc
ÐÒÉ ÜÔÏÍ ÂÕÄÅÔ ÓÏÚÄÁÎ ËÁÔÁÌÏÇ `tc', × ËÏÔÏÒÙÊ ÂÕÄÕÔ ÐÏÍÅÝÅÎÙ ×ÓÅ ÆÁÊÌÙ Ó ÉÓÈÏÄÎÙÍÉ ÔÅËÓÔÁÍÉ.
$ cd tc $ ls CVS Makefile backend.c driver.c frontend.c parser.c
ëÁÔÁÌÏÇ `CVS' ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ×ÎÕÔÒÅÎÎÉÈ ÎÕÖÄ CVS. ïÂÙÞÎÏ ×ÁÍ ÎÅ ÓÌÅÄÕÅÔ ÒÅÄÁËÔÉÒÏ×ÁÔØ ÉÌÉ ÕÄÁÌÑÔØ ÆÁÊÌÙ, ÎÁÈÏÄÑÝÉÅÓÑ × ÜÔÏÍ ËÁÔÁÌÏÇÅ.
÷Ù ÚÁÐÕÓËÁÅÔÅ Ó×ÏÊ ÌÀÂÉÍÙÊ ÒÅÄÁËÔÏÒ, ÒÁÂÏÔÁÅÔÅ ÎÁÄ `backend.c' É ÞÅÒÅÚ ÐÁÒÕ ÞÁÓÏ× ×Ù ÄÏÂÁ×ÉÌÉ ÆÁÚÕ ÏÐÔÉÍÉÚÁÃÉÉ × ËÏÍÐÉÌÑÔÏÒ. úÁÍÅÞÁÎÉÅ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ RCS É RCCS: ÎÅ ÔÒÅÂÕÅÔÓÑ ÂÌÏËÉÒÏ×ÁÔØ ÆÁÊÌÙ, ËÏÔÏÒÙÅ ×Ù ÖÅÌÁÅÔÅ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ. See section îÅÓËÏÌØËÏ ÒÁÚÒÁÂÏÔÞÉËÏ×, ÇÄÅ ÐÒÉ×ÅÄÅÎÙ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÏÂßÑÓÎÅÎÉÑ.
ðÏÓÌÅ ÔÏÇÏ, ËÁË ×Ù ÐÒÏ×ÅÒÉÌÉ, ÞÔÏ ËÏÍÐÉÌÑÔÏÒ ×ÓÅ ÅÝÅ ËÏÍÐÉÌÉÒÕÅÔÓÑ, ×Ù ÒÅÛÉÌÉ ÓÏÚÄÁÔØ ÎÏ×ÕÀ ×ÅÒÓÉÀ `backend.c'. ðÒÉ ÜÔÏÍ × ÒÅÐÏÚÉÔÏÒÉÉ ÐÏÑ×ÉÔÓÑ ×ÁÛ ÎÏ×ÙÊ `backend.c', ËÏÔÏÒÙÊ ÓÔÁÎÅÔ ÄÏÓÔÕÐÎÙÍ ×ÓÅÍ, ÉÓÐÏÌØÚÕÀÝÉÍ ÜÔÏÔ ÒÅÐÏÚÉÔÏÒÉÊ.
$ cvs commit backend.c
CVS ÚÁÐÕÓËÁÅÔ ÒÅÄÁËÔÏÒ, ÞÔÏÂÙ ÐÏÚ×ÏÌÉÔØ ×ÁÍ ××ÅÓÔÉ ÖÕÒÎÁÌØÎÕÀ ÚÁÐÉÓØ. ÷Ù ÎÁÂÉÒÁÅÔÅ "äÏÂÁ×ÌÅÎÁ ÆÁÚÁ ÏÐÔÉÍÉÚÁÃÉÉ", ÓÏÈÒÁÎÑÅÔÅ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ É ×ÙÈÏÄÉÔÅ ÉÚ ÒÅÄÁËÔÏÒÁ.
ðÅÒÅÍÅÎÎÁÑ ÏËÒÕÖÅÎÉÑ $CVSEDITOR
ÏÐÒÅÄÅÌÑÅÔ, ËÁËÏÊ ÉÍÅÎÎÏ
ÒÅÄÁËÔÏÒ ÂÕÄÅÔ ×ÙÚ×ÁÎ. åÓÌÉ $CVSEDITOR
ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ, ÔÏ
ÉÓÐÏÌØÚÕÅÔÓÑ $EDITOR
, ÅÓÌÉ ÏÎÁ, × Ó×ÏÀ ÏÞÅÒÅÄØ,
ÕÓÔÁÎÏ×ÌÅÎÁ. åÓÌÉ ÏÂÅ ÐÅÒÅÍÅÎÎÙÅ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ, ÉÓÐÏÌØÚÕÅÔÓÑ
ÒÅÄÁËÔÏÒ ÐÏ ÕÍÏÌÞÁÎÉÀ ÄÌÑ ×ÁÛÅÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ, ÎÁÐÒÉÍÅÒ,
vi
ÐÏÄ UNIX ÉÌÉ notepad
ÄÌÑ Windows 95/NT.
÷ÄÏÂÁ×ÏË, CVS ÐÒÏ×ÅÒÑÅÔ ÐÅÒÅÍÅÎÎÕÀ ÏËÒÕÖÅÎÉÑ VISUAL
.
óÕÝÅÓÔ×ÕÀÔ ÒÁÚÌÉÞÎÙÅ ÍÎÅÎÉÑ Ï ÔÏÍ, ÔÒÅÂÕÅÔÓÑ ÌÉ ÔÁËÏÅ ÐÏ×ÅÄÅÎÉÅ É
ÄÏÌÖÎÙ ÌÉ ÄÁÌØÎÅÊÛÉÅ ×ÅÒÓÉÉ CVS ÐÒÏ×ÅÒÑÔØ ÐÅÒÅÍÅÎÎÕÀ
VISUAL
ÉÌÉ ÉÇÎÏÒÉÒÏ×ÁÔØ Å£. ÷ ÌÀÂÏÍ ÓÌÕÞÁÅ, ÌÕÞÛÅ ×ÓÅÇÏ
ÂÕÄÅÔ ÕÂÅÄÉÔØÓÑ, ÞÔÏ VISUAL
ÉÌÉ ×ÏÏÂÝÅ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ, ÉÌÉ
ÕÓÔÁÎÏ×ÌÅÎÁ × ÔÏ ÖÅ ÚÎÁÞÅÎÉÅ, ÞÔÏ É EDITOR
.
ëÏÇÄÁ CVS ÚÁÐÕÓËÁÅÔ ÒÅÄÁËÔÏÒ, × ÛÁÂÌÏÎÅ ÄÌÑ ××ÏÄÁ ÖÕÒÎÁÌØÎÏÊ
ÚÁÐÉÓÉ ÐÅÒÅÞÉÓÌÅÎÙ ÉÚÍÅÎÅÎÎÙÅ ÆÁÊÌÙ. äÌÑ ËÌÉÅÎÔÁ CVS ÜÔÏÔ
ÓÐÉÓÏË ÓÏÚÄÁÅÔÓÑ ÐÕÔ£Í ÓÒÁ×ÎÅÎÉÑ ×ÒÅÍÅÎÉ ÉÚÍÅÎÅÎÉÑ ÆÁÊÌÁ Ó ÅÇÏ
×ÒÅÍÅÎÅÍ ÉÚÍÅÎÅÎÉÑ, ËÏÇÄÁ ÏÎ ÂÙÌ ÐÏÌÕÞÅÎ ÉÌÉ ÏÂÎÏ×ÌÅÎ. ôÁËÉÍ
ÏÂÒÁÚÏÍ, ÅÓÌÉ ×ÒÅÍÑ ÉÚÍÅÎÅÎÉÑ ÆÁÊÌÁ ÉÚÍÅÎÉÌÏÓØ, Á ÅÇÏ ÓÏÄÅÒÖÉÍÏÅ
ÏÓÔÁÌÏÓØ ÐÒÅÖÎÉÍ, ÏÎ ÂÕÄÅÔ ÓÞÉÔÁÔØÓÑ ÉÚÍÅÎÅÎÎÙÍ. ðÒÏÝÅ ×ÓÅÇÏ ×
ÄÁÎÎÏÍ ÓÌÕÞÁÅ ÎÅ ÏÂÒÁÝÁÔØ ÎÁ ÜÔÏ ×ÎÉÍÁÎÉÑ -- × ÐÒÏÃÅÓÓÅ
ÆÉËÓÉÒÏ×ÁÎÉÑ ÉÚÍÅÎÅÎÉÊ CVS ÏÐÒÅÄÅÌÉÔ, ÞÔÏ ÓÏÄÅÒÖÉÍÏÅ ÆÁÊÌÁ
ÎÅ ÉÚÍÅÎÉÌÏÓØ É ÐÏ×ÅÄÅÔ ÓÅÂÑ ÄÏÌÖÎÙÍ ÏÂÒÁÚÏÍ. óÌÅÄÕÀÝÁÑ ËÏÍÁÎÄÁ
update
ÓÏÏÂÝÉÔ CVS, ÞÔÏ ÆÁÊÌ ÎÅ ÂÙÌ ÉÚÍÅÎÅÎ, É ÅÇÏ
×ÒÅÍÑ ÉÚÍÅÎÅÎÉÑ ÂÕÄÅÔ ×ÏÚ×ÒÁÝÅÎÏ × ÐÒÅÖÎÅÅ ÚÎÁÞÅÎÉÅ, ÔÁË ÞÔÏ ÜÔÏÔ
ÆÁÊÌ ÎÅ ÂÕÄÅÔ ÍÅÛÁÔØÓÑ ÐÒÉ ÄÁÌØÎÅÊÛÉÈ ÆÉËÓÉÒÏ×ÁÎÉÑÈ.
åÓÌÉ ×Ù ÈÏÔÉÔÅ ÉÚÂÅÖÁÔØ ÚÁÐÕÓËÁ ÒÅÄÁËÔÏÒÁ, ÕËÁÖÉÔÅ ÖÕÒÎÁÌØÎÕÀ ÚÁÐÉÓØ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ, ÉÓÐÏÌØÚÕÑ ÆÌÁÇ `-m', ÎÁÐÒÉÍÅÒ:
$ cvs commit -m "äÏÂÁ×ÌÅÎÁ ÆÁÚÁ ÏÐÔÉÍÉÚÁÃÉÉ" backend.c
ðÅÒÅÄ ÔÅÍ, ËÁË ÐÅÒÅÊÔÉ Ë ÄÒÕÇÉÍ ÚÁÎÑÔÉÑÍ, ×Ù ÒÅÛÁÅÔÅ ÕÄÁÌÉÔØ
ÒÁÂÏÞÕÀ ËÏÐÉÀ tc
. ëÏÎÅÞÎÏ ÖÅ, ÜÔÏ ÍÏÖÎÏ ÓÄÅÌÁÔØ ÔÁË:
$ cd .. $ rm -r tc
ÎÏ ÌÕÞÛÉÍ ÓÐÏÓÏÂÏÍ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ËÏÍÁÎÄÙ release
(see section ëÏÍÁÎÄÁ release: ÓÏÏÂÝÉÔØ, ÞÔÏ ÍÏÄÕÌØ ÂÏÌÅÅ ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ):
$ cd .. $ cvs release -d tc M driver.c ? tc You have [1] altered files in this repository. Are you sure you want to release (and delete) directory `tc': n ** `release' aborted by user choice.
ëÏÍÁÎÄÁ release
ÐÒÏ×ÅÒÑÅÔ, ÞÔÏ ×ÓÅ ×ÁÛÉ ÉÚÍÅÎÅÎÉÑ ÂÙÌÉ
ÚÁÆÉËÓÉÒÏ×ÁÎÙ. åÓÌÉ ×ËÌÀÞÅÎÏ ÖÕÒÎÁÌÉÒÏ×ÁÎÉÅ ÉÓÔÏÒÉÉ, ÔÏ × ÆÁÊÌÅ
ÉÓÔÏÒÉÉ ÐÏÑ×ÌÑÅÔÓÑ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÁÑ ÐÏÍÅÔËÁ. See section æÁÊÌ history.
åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ËÏÍÁÎÄÕ release
Ó ÆÌÁÇÏÍ `-d', ÔÏ
ÏÎÁ ÕÄÁÌÑÅÔ ×ÁÛÕ ÒÁÂÏÞÕÀ ËÏÐÉÀ.
÷ ×ÙÛÅÐÒÉ×ÅÄÅÎÎÏÍ ÐÒÉÍÅÒÅ ËÏÍÁÎÄÁ release
×ÙÄÁÌÁ ÎÅÓËÏÌØËÏ
ÓÔÒÏË. `? tc' ÏÚÎÁÞÁÅÔ, ÞÔÏ ÆÁÊÌ `tc' ÎÅÉÚ×ÅÓÔÅÎ
CVS. âÅÓÐÏËÏÉÔØÓÑ ÎÅ Ï ÞÅÍ, `tc' -- ÜÔÏ ÉÓÐÏÌÎÑÅÍÙÊ
ÆÁÊÌ ËÏÍÐÉÌÑÔÏÒÁ, É ÅÇÏ ÎÅ ÓÌÅÄÕÅÔ ÈÒÁÎÉÔØ × ÒÅÐÏÚÉÔÏÒÉÉ.
See section éÇÎÏÒÉÒÏ×ÁÎÉÅ ÆÁÊÌÏ× Ó ÐÏÍÏÝØÀ cvsignore, ÇÄÅ ÍÏÖÎÏ ÎÁÊÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ÔÏÍ, ËÁË
ÉÚÂÅÖÁÔØ ÜÔÏÇÏ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ. See section óÏÏÂÝÅÎÉÑ ËÏÍÁÎÄÙ release,
ÇÄÅ ÎÁÈÏÄÉÔÓÑ ÐÏÌÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ×ÏÚÍÏÖÎÙÈ ÓÏÏÂÝÅÎÉÑÈ ËÏÍÁÎÄÙ
release
.
`M driver.c' -- ÂÏÌÅÅ ÓÅÒØÅÚÎÏÅ ÓÏÏÂÝÅÎÉÅ. ïÎÏ ÏÚÎÁÞÁÅÔ, ÞÔÏ ÆÁÊÌ `driver.c' ÂÙÌ ÉÚÍÅÎÅÎ Ó ÍÏÍÅÎÔÁ ÐÏÓÌÅÄÎÅÇÏ ÐÏÌÕÞÅÎÉÑ ÉÚ ÒÅÐÏÚÉÔÏÒÉÑ.
ëÏÍÁÎÄÁ release
×ÓÅÇÄÁ ÓÏÏÂÝÁÅÔ, ÓËÏÌØËÏ ÉÚÍÅÎÅÎÎÙÈ ÆÁÊÌÏ×
ÎÁÈÏÄÉÔÓÑ × ×ÁÛÅÊ ÒÁÂÏÞÅÊ ËÏÐÉÉ ÉÓÈÏÄÎÙÈ ËÏÄÏ×, Á ÚÁÔÅÍ
ÓÐÒÁÛÉ×ÁÅÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ ÐÅÒÅÄ ÕÄÁÌÅÎÉÅÍ ÆÁÊÌÏ× ÉÌÉ ×ÎÅÓÅÎÉÑ
ÐÏÍÅÔËÉ × ÆÁÊÌ ÉÓÔÏÒÉÉ.
÷Ù ÒÅÛÁÅÔÅ ÐÅÒÅÓÔÒÁÈÏ×ÁÔØÓÑ É ÏÔ×ÅÞÁÅÔÅ n RET, ËÏÇÄÁ
release
ÐÒÏÓÉÔ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ.
÷Ù ÎÅ ÐÏÍÎÉÔÅ, ÞÔÏ ÉÚÍÅÎÑÌÉ ÆÁÊÌ `driver.c', ÐÏÜÔÏÍÕ ÈÏÔÉÔÅ ÐÏÓÍÏÔÒÅÔØ, ÞÔÏ ÉÍÅÎÎÏ ÓÌÕÞÉÌÏÓØ Ó ÎÉÍ.
$ cd tc $ cvs diff driver.c
üÔÁ ËÏÍÁÎÄÁ ÓÒÁ×ÎÉ×ÁÅÔ ×ÅÒÓÉÀ ÆÁÊÌÁ `driver.c', ÎÁÈÏÄÑÝÅÊÓÑ × ÒÅÐÏÚÉÔÏÒÉÉ, Ó ×ÁÛÅÊ ÒÁÂÏÞÅÊ ËÏÐÉÅÊ. ëÏÇÄÁ ×Ù ÒÁÓÓÍÁÔÒÉ×ÁÅÔÅ ÉÚÍÅÎÅÎÉÑ, ×Ù ×ÓÐÏÍÉÎÁÅÔÅ, ÞÔÏ ÄÏÂÁ×ÉÌÉ ÁÒÇÕÍÅÎÔ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ, ÒÁÚÒÅÛÁÀÝÉÊ ÆÁÚÕ ÏÐÔÉÍÉÚÁÃÉÉ. ÷Ù ÆÉËÓÉÒÕÅÔÅ ÜÔÏ ÉÚÍÅÎÅÎÉÅ É ×ÙÓ×ÏÂÏÖÄÁÅÔÅ ÍÏÄÕÌØ.
$ cvs commit -m "äÏÂÁ×ÌÅÎÁ ÆÁÚÁ ÏÐÔÉÍÉÚÁÃÉÉ" driver.c Checking in driver.c; /usr/local/cvsroot/tc/driver.c,v <-- driver.c new revision: 1.2; previous revision: 1.1 done $ cd .. $ cvs release -d tc ? tc You have [0] altered files in this repository. Are you sure you want to release (and delete) directory `tc': y
Go to the first, previous, next, last section, table of contents.