1. Getting Started ¶

1.1. Installing CVS ¶

CVS�� 해��. -_-; �� 패키�� 하�� , �� 하�� . �� . �� 하�� apt-get install cvs�� 히 �� .

1.2. Creating a Repository ¶

�� 테��트�� CVS�� CVS�� .
CVS�� .

~cpp 
Unix: cvs -d ~/sandbox init                     // ������ ������������ /home/CVSHOME ��� ������하������.
Wind: cvs -d d:sandbox init

1.3. CVS Commands ¶

CVS클��트�� 형태�� 클��트�� , GUI형태�� TortoiseCVS, WinCVS�� . (sourceforge.net�� 확��) ��한 IDE �� CVS 클��트�� 하�� . (ex. eclipse, dev-cpp)

1.4. Creating a Simple Project ¶

��한 ��트�� CVS�� . �� 크�� .

color.text

~cpp 
black
brown
red
orange
yellow
green

number.text

~cpp 
zero
one
two
three
four

�� 파�� 폴�� 행��킨��.

~cpp 
tmpdir#cvs -d /home/CVSHOME/ import -m " " sesame sesame initial

import�� 트�� 파��.
-m " " ��트�� 포트할�� 할 ��. (��파티 �� 하�� 하��.)
sesame �� 트��
�� 2�� 파��(sesame initial) tag��.

�� CVS ��트 ��토�� 트�� ls �� 확��해��.

1.5. Starting to Work With a Project ¶

�� 파�� 크��해��. ��해�� ~/work �� 토�� 하��.

~cpp 
#mkdir ~/work
#cd ~/work
#cvs -d /home/CVSHOME co sesame
cvs checkout: Updating sesame
U sesame/color.txt
U sesame/number.txt

~/work�� 해�� ~/work/sesame ��토�� 파�� 크�� 파�� 한��.

1.6. Making Changes ¶

color.txt �� 

~cpp 
black
brown
red
orange
yellow
blue
purple
gray
white

color.txt�� 한�� 트�� 해��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs status color.txt 
===================================================================
File: color.txt         Status: Locally Modified

   Working revision:    1.1.1.1 Tue Aug  2 05:50:14 2005
   Repository revision: 1.1.1.1 /home/CVSHOME/sesame/color.txt,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

�� status �� 확�� 하�� cvs�� 파�� 판��할 �� .

~cpp 
root@eunviho:~/tmpdir/sesame# cvs diff color.txt 
Index: color.txt
===================================================================
RCS file: /home/CVSHOME/sesame/color.txt,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 color.txt
6a7,10
> blue
> purple
> gray
> white

��한 diff �� 해�� 파�� 하�� 한��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs diff --side-by-side color.txt 
Index: color.txt
===================================================================
RCS file: /home/CVSHOME/sesame/color.txt,v
retrieving revision 1.1.1.1
diff --side-by-side -r1.1.1.1 color.txt
black                                                           black
brown                                                           brown
red                                                             red
orange                                                          orange
yellow                                                          yellow
green                                                           green
                                                              > blue
                                                              > purple
                                                              > gray
                                                              > white

--side-by-side �� 하�� 한화�� 하�� 할 �� .

1.7. Updating the Repository ¶

파�� , UnitTest�� 한 �� 해��할 ��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs commit -m "��������� 4������ ������ ��� ���함"
cvs commit: Examining .
/home/CVSHOME/sesame/color.txt,v  <--  color.txt
new revision: 1.2; previous revision: 1.1

�� 트�� commit �� 크��키�� 하��. �� -m �� 항�� 한 �� 하��, �� vi �� 행�� 할 �� 파�� .
(��해�� . -_-;)

~cpp 
root@eunviho:~/tmpdir/sesame# cvs status color.txt 
===================================================================
File: color.txt         Status: Up-to-date

   Working revision:    1.2     Tue Aug  2 13:08:47 2005
   Repository revision: 1.2     /home/CVSHOME/sesame/color.txt,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

commit �� 통해�� 크��하�� status�� 파�� 하�� .

~cpp 
root@eunviho:~/tmpdir/sesame# cvs log color.txt 

RCS file: /home/CVSHOME/sesame/color.txt,v
Working file: color.txt
head: 1.2
branch:
locks: strict
access list:
symbolic names:
        initial: 1.1.1.1
        sesame: 1.1.1
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.2
date: 2005-08-02 13:16:58 +0000;  author: sapius;  state: Exp;  lines: +4 -0
��������� 4������ ������ ��� ���함
----------------------------
revision 1.1
date: 2005-08-02 05:50:14 +0000;  author: sapius;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2005-08-02 05:50:14 +0000;  author: sapius;  state: Exp;  lines: +0 -0
 
=============================================================================

log�� 통해�� 파�� .

1.8. When Worlds Collide ¶

�� 한�� 파�� 할�� 황��해�� 펴��.
��한 �� 해�� sesame �� 토�� sesame�� 한��.

~cpp 
root@eunviho:~/tmpdir# cvs -d /home/CVSHOME/ co -d aladdin sesame
cvs checkout: Updating aladdin
U aladdin/color.txt
U aladdin/number.txt

��하�� 토��

~cpp 
root@eunviho:~/tmpdir# ll
total 8
drwxr-xr-x  3 root root 4096 2005-08-02 22:23 aladdin
drwxr-xr-x  3 root root 4096 2005-08-02 22:08 sesame

�� 한 �� 트�� 토�� 할�� .

sesame/number.txt

~cpp 
root@eunviho:~/tmpdir# vi sesame/number.txt
zero
one
two
three
four
five
six

�� 한 파�� 크�� 킨��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs commit -m "��������� ��� �����했���."
cvs commit: Examining .
/home/CVSHOME/sesame/number.txt,v  <--  number.txt
new revision: 1.2; previous revision: 1.1

sesame 폴�� 파�� 하�� 크�� aladdin 폴�� 하�� 파�� .

~cpp 
root@eunviho:~/tmpdir/aladdin# cvs status number.txt 
===================================================================
File: number.txt        Status: Needs Patch

   Working revision:    1.1.1.1 Tue Aug  2 05:50:14 2005
   Repository revision: 1.2     /home/CVSHOME/sesame/number.txt,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

�� 확�� 해�� aladdin/number.txt �� 크�� 통해�� 화�� 해��한�� 태�� .

�� 한��

~cpp 
root@eunviho:~/tmpdir/aladdin# cvs diff -rHEAD number.txt     
Index: number.txt
===================================================================
RCS file: /home/CVSHOME/sesame/number.txt,v
retrieving revision 1.2
retrieving revision 1.1.1.1
diff -r1.2 -r1.1.1.1
6,7d5
< five
< six

-rHEAD�� branches�� 하�� 하�� . �� cvs�� 한 �� 한��.

~cpp 
root@eunviho:~/tmpdir/aladdin# cvs diff number.txt

�� aladdin �� 한 �� number.txt�� 화�� .

�� 하��

~cpp 
root@eunviho:~/tmpdir/aladdin# cvs update
cvs update: Updating .
U number.txt

�� 파�� 파�� 할 ��. �� 파�� .

1.9. Conflict Resolution ¶

�� 해�� 파�� 하�� 해��.

sesame/number.txt

~cpp 
root@eunviho:~/tmpdir# vi sesame/number.txt 
ZERO
one
two
three
four
five
six

sesame/number.txt

~cpp 
root@eunviho:~/tmpdir# vi aladdin/number.txt 
zero
one
two
three
four
five
SIX

�� aladdin �� 파�� 크��한��.

~cpp 
root@eunviho:~/tmpdir/aladdin# cvs commit -m "make number six to be important"
cvs commit: Examining .
/home/CVSHOME/sesame/number.txt,v  <--  number.txt
new revision: 1.3; previous revision: 1.2

�� sesame�� 파�� 한 �� 크�� 한�� 해��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs commit -m"make number zero to be emphasized"
cvs commit: Examining .
cvs commit: Up-to-date check failed for `number.txt'
cvs [commit aborted]: correct above errors first!

�� 크��하�� 한��.

�� 했�� 한 ��.
�� 해��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs update
cvs update: Updating .
RCS file: /home/CVSHOME/sesame/number.txt,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into number.txt
M number.txt

sesame/number.txt�� 확��해��

~cpp 
root@eunviho:~/tmpdir/sesame# vi number.txt 
ZERO
one
two
three
four
five
SIX

�� cvs�� 판��해�� .

��

~cpp 
root@eunviho:~/tmpdir/sesame# cvs commit -m"make number zero to be emphasized"
cvs commit: Examining .
/home/CVSHOME/sesame/number.txt,v  <--  number.txt
new revision: 1.4; previous revision: 1.3

�� 크�� 하��. �� aladdin 폴�� 할 ��.

1.9.1. �� - �� 하�� ¶

�� 2�� 한 �� 해��하�� 큰 �� cvs�� 해��. �� 한 �� ?

sesame/number.txt

~cpp 
root@eunviho:~/tmpdir# vi sesame/number.txt 
ZERO
ichi
two
three
four
five
SIX

aladdin/number.txt

~cpp 
root@eunviho:~/tmpdir# vi aladdin/number.txt 
ZERO
uno
two
three
four
five
SIX

~cpp 
root@eunviho:~/tmpdir/aladdin# cvs commit -m "users like italian word of one"
cvs commit: Examining .
/home/CVSHOME/sesame/number.txt,v  <--  number.txt
new revision: 1.5; previous revision: 1.4
.
.
root@eunviho:~/tmpdir/sesame# cvs commit -m "must be japanese of word one"
cvs commit: Examining .
cvs commit: Up-to-date check failed for `number.txt'
cvs [commit aborted]: correct above errors first!
.
.
root@eunviho:~/tmpdir/sesame# cvs update
cvs update: Updating .
RCS file: /home/CVSHOME/sesame/number.txt,v
retrieving revision 1.4
retrieving revision 1.5
Merging differences between 1.4 and 1.5 into number.txt
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in number.txt
C number.txt

3�� , ��한 �� 한 �� .
�� rcsmerge �� 표��한��.

sesame/number.txt

~cpp 
ZERO
<<<<<<< number.txt
ichi
=======
uno
>>>>>>> 1.5
two
three
four
five
SIX

�� <<<<<<< >>>>>>> �� 하�� 킨 ��.

�� 한 �� 했�� 한��.

~cpp 
root@eunviho:~/tmpdir/sesame# cvs log -r1.5 number.txt 

RCS file: /home/CVSHOME/sesame/number.txt,v
Working file: number.txt
head: 1.5
branch:
locks: strict
access list:
symbolic names:
        initial: 1.1.1.1
        sesame: 1.1.1
keyword substitution: kv
total revisions: 6;     selected revisions: 1
description:
----------------------------
revision 1.5
date: 2005-08-02 13:46:44 +0000;  author: sapius;  state: Exp;  lines: +1 -1
users like italian word of one
=============================================================================

�� 크�� 한 �� , �� .
�� 합해�� 한 �� 토�� 통해�� .
�� ichi�� 했�� 하��. ichi�� 한��. �� 토��
two�� due�� 했�� 하��

~cpp 
root@eunviho:~/tmpdir/sesame# vi number.txt 
ZERO
ichi
due
three
four
five
SIX
.
.
root@eunviho:~/tmpdir/sesame# cvs commit -m "one is japanese, two is italian"
cvs commit: Examining .
/home/CVSHOME/sesame/number.txt,v  <--  number.txt
new revision: 1.6; previous revision: 1.5

�� (��한 ��)�� 해�� 트�� 하�� 화�� 한 �� 하�� .

----
PragmaticVersionControlWithCVS

Pragmatic Version Control WithCVS/Getting Started

Contents

1. Getting Started ¶

1.1. Installing CVS ¶

1.2. Creating a Repository ¶

1.3. CVS Commands ¶

1.4. Creating a Simple Project ¶

1.5. Starting to Work With a Project ¶

1.6. Making Changes ¶

1.7. Updating the Repository ¶

1.8. When Worlds Collide ¶

1.9. Conflict Resolution ¶

1.9.1. �� - �� 하�� ¶

Pragmatic Version Control WithCVS/Getting Started

Contents

1. Getting Started ¶

1.1. Installing CVS ¶

1.2. Creating a Repository ¶

1.3. CVS Commands ¶

1.4. Creating a Simple Project ¶

1.5. Starting to Work With a Project ¶

1.6. Making Changes ¶

1.7. Updating the Repository ¶

1.8. When Worlds Collide ¶

1.9. Conflict Resolution ¶

1.9.1. ��������� - ������ ��������� ������하��� ������ ¶

1.9.1. �� - �� 하�� ¶