1. Common CVS Commands ¶

�� 는 ��리�� cvs를 �� 는 �� 90��를 ��는 대부�� 명��를 ��룬��.
(��번�� 많�� . 대략 4~50 �� . ��만 보면 cvs ��는데 �� 무리는 �� 듯��.)

1.1. Checking Things Out ¶

~cpp 
root@eunviho:~/tmp2# cvs co sesame sesame2
cvs checkout: Updating sesame
U sesame/color.txt
U sesame/number.txt
cvs checkout: Updating sesame2
U sesame2/color.txt
U sesame2/number.txt

cvs server �� sesame sesame2 2�� 모듈�� 모듈�� 동�� 디��리��

~cpp 
root@eunviho:~/tmp2# cvs co sesame2/sesame2
cvs checkout: Updating sesame2/sesame2
U sesame2/sesame2/color.txt
U sesame2/sesame2/number.txt
cvs checkout: Updating sesame2/sesame2/templates
U sesame2/sesame2/templates/test.test

�� 는 �� 모듈�� 디��리�� 부��만�� .

-r : �� . ��번�� 리�� .

CVS는 HEAD, BASE��는 2�� 리��를 ��동�� .

HEAD : �� . 대부�� 명�� 본��.
BASE : 마��막�� 디��리��

-D : ��를 �� .

~cpp 
root@eunviho:~/tmp2# cvs log sesame
cvs log: Logging sesame

RCS file: /home/CVSHOME/sesame/color.txt,v
Working file: sesame/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
°&#237;°´&#192;&#204; 4¤¡&#193;&#246; &#187;&#246;&#192;&#187; ´&#245; ¿ø&#199;&#212;
----------------------------
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
 
=============================================================================
.
.
.
root@eunviho:~/tmp2# cvs co -r 1.1 sesame
cvs checkout: Updating sesame
U sesame/color.txt
U sesame/number.txt

�� 내�� 면 checkout �� 1.1�� .

cvs �� 는 ��

ISO8601	2003-06-04 20030604 2003-06-04 20:12 2003-06-04T20:12 2003-06-04 20:12Z 2003-06-05 20:12:00-0500
E-Mail format	Mon Jun 9 17:12:56 CDT 2003 Mon, Jun 9 17:12:56 2003 Jun 9 17:12:56 2003 June 9, 2003
Relative	1 day ago 27 minutes ago last monday yesterday third week ago

1.2. Keeping Up To Date ¶

�� 머들�� 를 ��는 ��는 내�� 램�� 는 동�� 른 ��머들�� 램�� 능�� 대�� 높��. 만�� 면 ��머�� 리�� merge �� . ��문�� 를 checkout ��는 �� .

cvs update -d files or directory : �� 디��리�� 는 모�� 더를 �� . -d �� 디��리�� 는 �� cvs�� 더�� 동�� 더를 만들�� .

~cpp 
root@eunviho:~/tmpdir/sesame# cvs update -d template
cvs update: Updating template
U template/file1.java
root@eunviho:~/tmpdir/sesame# cvs update
cvs update: Updating .
U number.txt
cvs update: Updating template

update ��는 변�� 대�� 보�� .
�� 러�� 문��.

~cpp 
StarterKit> cvs update
? SourceCode/tmpdoc.ilg
? SourceCode/tmpdoc.toc
cvs server: Updating .
RCS file: /home/CVSROOT/PP/doc/StarterKit/pragprog.sty,v
retrieving revision 1.16
retrieving revision 1.17
Merging differences between 1.16 and 1.17 into pragprog.sty
M pragprog.sty
cvs server: Updating SourceCode
A SourceCode/CommonCommands.tip
M SourceCode/HowTo.tip
A SourceCode/Releases.tip
cvs server: Updating SourceCode/images
cvs server: Updating UnitTest
P UnitTest/DesignIssues.tip
U UnitTest/InAProject.tip
P UnitTest/Introduction.tip
cvs server: Updating UnitTest/code
U UnitTest/code/Age.java
U UnitTest/code/TestMyStack.java
U UnitTest/code/testdata.txt
cvs server: Updating UnitTest/code/rev1
cvs server: Updating UnitTest/code/rev2
cvs server: Updating UnitTest/code/rev3
cvs server: Updating util

? : ��는 �� CVS�� 못��는 ��
A : �� 됨
M : ��
U,P : �� 는 �� 보�� 됨
C : �� 변�� 돌��

~cpp 
cvs ��� 동���방������ ������
cvs 는 ������ 명������ ��������� ���러 ������ ������������ ����������� ���������는 ������ ���������.
���를 들������

cvs -q -d /home/CVSHOME checkout -d temp
    -- ----------------          -------
    |          |                     |
quiet mode repository      checkout destination

������ ������ 동������ ������������만 ��������� 따������ ��� ���미���는 바��� ���른 ��������� ��������.

1.3. Adding Files and Directories ¶

cvs add : �� 디��리를 �� .

~cpp 
root@eunviho:~/tmpdir/sesame# cvs add template2
Directory /home/CVSHOME/sesame/template2 added to the repository

root@eunviho:~/tmpdir/sesame# cd template2/

root@eunviho:~/tmpdir/sesame/template2# cvs add test.txt  
cvs add: scheduling file `test.txt' for addition
cvs add: use `cvs commit' to add this file permanently

root@eunviho:~/tmpdir/sesame/template2# cvs commit -m "new file added"
cvs commit: Examining .
/home/CVSHOME/sesame/template2/test.txt,v  <--  test.txt
initial revision: 1.1

1.3.1. CVS and binary files ¶

CVS는 ��램 �� , XML 등 �� .

바뀐 부��만�� 문�� 리�� 를 �� 면�� 량��
��, �� 문��를 ��.
�� 를 대��는 방�� . (��)

��만 바��리�� 는 문�� .

바��리를 대��는 미동��
��바�� 는 바��리�� 만�� 바��리 부�� 바��면 바��리�� .
바��리 �� CVS �� 들��면 �� 문�� .

cvs add -kb File : �� 대��는 �� 마디 �� 를 �� 리를 �� 는��.

만�� 바��리 �� -kb�� add ��면 ��를 바��는 방�� .

마�� 마��리�� 내�� 

~cpp 
work> cvs add DataFormat.doc #<-- forgot the -kb option
cvs add: scheduling file ��DataFormat.doc’ for addition
cvs add: use ’cvs commit’ to add this file permanently

work> mv DataFormat.doc Temp.doc
work> cvs remove DataFormat.doc
cvs remove: removed ��DataFormat.doc’

work> mv Temp.doc DataFormat.doc
work> cvs add -kb DataFormat.doc #<-- use the option
cvs add: scheduling file ��DataFormat.doc’ for addition
cvs add: use ’cvs commit’ to add this file permanently

work> cvs commit -m "Add new data format document"

��는 ��르�� -kb�� checkout�� 미 �� 면
�� 복�� 능��.

~cpp 
work> # reset the flag in the repository
work> cvs admin -kb DataFormat.doc
work> # then reset the flags in our workspace
work> cvs update -A DataFormat.doc
work> # copy a known good copy over this file
work> cp ?/docs/DataFormat.doc DataFormat.doc
work> # and save this back in the repository
work> cvs commit -m "Reset -kb flag"

note) 바��리를 �� 면 cvswrappers �� 대�� 보��.
BOOK �� 76�� .

1.4. Ignoring Certain Files ¶

�� 는 ��는 ��러�� 들(.obj, .class 등등)�� . ��런 �� CVS �� 보��는 �� 마�� 는 �� . �� cvs 는 ��러�� 는 �� 능��.
.cvsignore file

~cpp 
dummy.java
*.class
*.log
*.obj

를 �� 면 �� .cvsignore 를 �� cvs는 ��런 �� 무��.
�� .cvsignore 를 �� 면 �� 를 방문��는 모�� 들�� 동�� 무�� 는 �� 능��.

~cpp 
root@eunviho:~/tmpdir/sesame#cvs add .cvsignore
root@eunviho:~/tmpdir/sesame#cvs commit -m"dummy write. ignore class, log, obj" .cvsignore

1.5. Renaming Files ¶

cvs�� , 디��리�� 바��는 �� .
방�� 바�� 내�� 들�� 뒤 �� 바뀐 ��들�� 는 방��뿐��.

~cpp 
root@eunviho:~/tmp/sesame# mv color.txt color_renamed.txt
root@eunviho:~/tmp/sesame# cvs remove color.txt
cvs remove: scheduling `color.txt' for removal
cvs remove: use `cvs commit' to remove this file permanently
root@eunviho:~/tmp/sesame# cvs add color_renamed.txt 
cvs add: scheduling file `color_renamed.txt' for addition
cvs add: use `cvs commit' to add this file permanently
root@eunviho:~/tmp/sesame# cvs commit -m "color.txt renamed"
cvs commit: Examining .
cvs commit: Examining template
cvs commit: Examining template2
/home/CVSHOME/sesame/color.txt,v  <--  color.txt
new revision: delete; previous revision: 1.2
/home/CVSHOME/sesame/color_renamed.txt,v  <--  color_renamed.txt
initial revision: 1.1

�� 리를 ��면 �� color.txt��는 �� 는 �� 들�� color_rename.txt�� 는 �� 불��. �� 따�� 보�� 문��.

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

   Working revision:    No entry for color.txt
   Repository revision: 1.3     /home/CVSHOME/sesame/Attic/color.txt,v

�� 보듯 color_renamed.txt��는 �� 1.1�� color.txt�� 1.3�� .

Pragmatic Version Control WithCVS/CommonCVS Commands

Contents

1. Common CVS Commands ¶

1.1. Checking Things Out ¶

1.2. Keeping Up To Date ¶

1.3. Adding Files and Directories ¶

1.3.1. CVS and binary files ¶

1.4. Ignoring Certain Files ¶

1.5. Renaming Files ¶

1.6. Renaming a Directory ¶

1.7. Seeing What’s Changed ¶

1.8. Handling Merge Conflicts ¶

1.9. Committing Changes ¶

1.10. Examining Change History ¶

1.11. Removing a Change ¶