() &* , +-./# " +/ &$ /8. White Paper Title Page 2

Transcription

1

2 ! "# # "% &' () &* +*, +-./0 1+// +// +/2 +/ &+/ " +/!"3/ +/#, +-./# "3 +/% )1"415/% /% /',61")571611"/8 & /8 White Paper Title Page 2

3 INTRODUCTION!!39)! 3 : (!! ; 3 3 9!!!< 3/0/2 WHAT IS CVS = 3(3 3 ; ; (! 3;!!! ;! 3!;!! > 3 33!!!(;! ;3!!3 TERMINOLOGY ; -.? ; !(! ;3,(3; (!!( ;!: White Paper Title Page 3

4 ! ( =! 1;!< 3 ( : ;!!! 36!; ( )!(;!- 3. ;!3!( 3;!333 > 33B! ; ;!! 3 > 3!! CVS STEP BY STEP!! 3!! ;! Downloading and Installing CVS ;! 3,:!5:< 3;!! -< 3/0/! ; < 3/0/2!. ; 3 ;!< 3! < 3! >! 7CC!!!3 7CC!!!!3+! ; 5;!! 7CC!!!3. ; ( 3: -: 7DE +D5,D /D57DE +D. White Paper Title Page 4

5 Creating a Repository : < 3!(!(?7& ;&& +! ;: ) : ( :! 7 cvs -version F :>! ; :!!!7 cvs d D:\CVS\CVSTryouts init! 7DD;! ")) = "))@:A Creating a CVS Connection 6 < 3;< 3 > 33: A>!< 3! "#!! < 3 White Paper Title Page 5

6 : > 5 3 ;=(3 % & G!!7 / 5 7 > (; ; 2 &7' 6 :!!(! "E 7 7 7DDA Before importing a module, configure the CVS repository to import binary file type as binary, to prevent them from becoming corrupted. Do not change the repository manually, to prevent you corrupt it by mistake. If you need to change some CVS configuration file, check out the CVSROOT as a module, modify the specific configuration file locally and commit it to the repository. Configuring the Repository 6 -:. :-!.!!3!(!; 3! ; -!. ( ")) ;3! - 9.:! 3 "))!?;!!( -!(.!< 3!( B < 3!? >!(")) )!()!G +!7 / &5 7()) > ;&4 < 3! White Paper Title Page 6

7 ")); + 7 ()) ")) 3 ; ( () +7 # +!G % 5!+7 % & *! + :?;!? ' E?(()),*? ()) 8 E)F <7DDD"))D3! "))? : 3H;H?;H?;H? HG?>! -!.7 *.gif -k 'b' *.jpg -k 'b' *.jpeg -k 'b' *.jar -k 'b' *.zip -k 'b' 3;=( 3 + (@! -!A )F>! I Importing a Module,< 3;!3?!(?!!(?;! 3? ; ( 3 )!!(!!( "=(!(.!G +!G!; ;( 7 White Paper Title Page 7

8 Name the module after the workspace or project for ease of recognition. / &5 7 3 ;: +!( ;-!3.? +7 & ( ( : >!(! 3 # E&(7 : ; (! 3!! (;! G! /, +!G > 3?I> 3!(!?! ( );! <7DD ;! <7DD ( ; <7DD 3 ; <7DD ( (! <7DD!3!!(-@ :A.! 3 3 ; <7DD (! 6 (?- 3 ( 3. White Paper Title Page 8

9 Checking Out a Module!( ;( ;!")) -@"A.!6 3!( -!( < 3 <7DD. ( >(< 3 )!()!G +!7 / &5 7 > ;&4! + 7 () +7 # +!G % E)F!( < 3!? >!!! 3< 3 &0+ (;!,+!! > ;< 3,+!!!! Adding Files!(!! 3 ( White Paper Title Page 9

10 3?! J <7DDD&&D> 3! Always add a file as soon as it has been created to prevent that it is deleted during an update or not uploaded during a commit. Always do an update before you start editing files, to make sure you work with the most recent copies. It is preferred you do a clean update of the module before you start making changes. But first make sure you added any file that you want to keep, otherwise a clean update will delete these files. >!=( 1 )!!)F! ;! ( ; +!!,+!!!! 3 3 : 3 < 3 (! Updating Files (Common) 3!( ( 3!( >!( =( 02 +?0 * + > 3 =( 0?? 6! 0( 3(;! 35! 3!! 3 3! ;: 3 ( % &+!!(: )!!!! White Paper Title Page 10

11 When updating a module, also check Create New Folders and Prune Empty Folders, to make that new folders are created and empty folders are deleted. ( "+!! 3; 3 Editing Files > < 3( =-=KE= K=K(& (5!+" ).6 ;! 1!!(!!(! < 3 -( +6.;! ( < 3! =< 3!3 + 3! (;(?: & ( ( ; (!(!3 3!!(!G! > ( ( 3;!3!( ( 3!(! 3 ; ( & ( ( 3 Deleting Files > =( ( 3!? < 3!!3,+!!> (! 3! > 3 +-.A.5!B!!;3 ( White Paper Title Page 11

12 3 A; ( 33!!! - ;!. Committing Files 3> 33! > 33!,+!!!!!!! Always refresh the Uncommitted Files window by choosing Refresh States from the Versioning menu and save all files before choosing Commit All. This is to prevent that deleted files and changed index files are not committed. Always enter a statement that summarizes what has been changed and why. This can be useful for developers whose work is affected by the changes. > 3 A,+!>!! ; (! )! +A.> 3 3 3! :( < 3? : )!?!!!!! G!! 3( 3 (!3@A! ( 6 ;?; = 3 ( G! 3 White Paper Title Page 12

13 ; Comparing Files >!!!( ;=( 2!!; (! :-(!9!L!.>!! >!3! =( =K)"3!!!! 3! >!!! ;! (; White Paper Title Page 13

14 Merging Files 3! +-.A.!3; B! +A. 3 ;!3!;! :@NA 3 /A )3 ((! : 7 <<<<<<< [file name] [your changes] ======= [text as in the repository] >>>>>>> [revision] > 33 3 ( 63 3! 3 3! -:. -!!! 3.!3 Do not rename a file with JDeveloper (File -> Rename). Currently JDeveloper will not remove the old file from the repository. As a result the old file will return when the folder is updated but not in the JDeveloper project. Explicitly remove the old file and add the new file instead. Renaming Files, 3!! ; ( ; 3!?! -@ +A.!! -@ +A. 3 >! (7@ O=K!OA! View Revisions > 3!3 3 =( &3!! 3 -@ A. White Paper Title Page 14

15 Tagging Files 3 > ;! 3 ;?!(! > 3 ;! ;; -@OA. -@=@.! 3 3 O/=/=0A < 3 -!(?.=( 2 + * + 3 (!! ;! 3!! 3 : ( B(!! :; -@)A. Updating Files (Special) > -!(?. ;! 3 3 >3 3 =( * + 3 (! 0 ) (0(% - 3! 36(E, )!! 3 ; 3 6 3! ;! 3@(A!!3! 3! 33 =( *+ ( () White Paper Title Page 15

16 Retrieving Deleted Files )! 3!3 (!! ; 3 ;3 > 3; 3 ( -@, +-.A.> 3; (! ;! ;! 3 6 ;(! ( ( +A < 3;; 3 =:.! A? 3 A>! 7 cvs add myfile.java cvs update myfile.java cvs commit!!? 3 < 3? OTHER CVS CLIENTS TortoiseCVS!!1: > : = ( :=3;! ;!! -!< ! ; White Paper Title Page 16

17 ;3 33!! ; ; 3;!>! < 3!3!! 3! :!! 7CC!!!3 WinCVS 3 3 ;(!! 3 3! ;! 3 > 3! ;! White Paper Title Page 17

18 > ;:; > ;! 3 ; ( 3; 3!! 7CC!!!!3C SUBVERSION: THE BETTER CVS & -&. <2113?;!(3 3?@ A 3!B! (3@6A-.!7! " # % & ' 3< 3; MORE INFORMATION > < 3;5-7CC!!!3.; -7CC!!!3. -7CC!!!!3. : 7CC( C!3=! White Paper Title Page 18

19 & 3 7CC3 5 7CC3 ) 7 7,=; 200 White Paper Title Page 19

20 White Paper Title February 2005 Author: Jan Kettenis Oracle Corporation World Headquarters 500 Oracle Parkway Redwood Shores, CA U.S.A. Worldwide Inquiries: Phone: Fax: oracle.com Copyright 2005, Oracle. All rights reserved. This document is provided for information purposes only and the contents hereof are subject to change without notice. This document is not warranted to be error-free, nor subject to any other warranties or conditions, whether expressed orally or implied in law, including implied warranties and conditions of merchantability or fitness for a particular purpose. We specifically disclaim any liability with respect to this document and no contractual obligations are formed either directly or indirectly by this document. This document may not be reproduced or transmitted in any form or by any means, electronic or mechanical, for any purpose, without our prior written permission. Oracle is a registered trademark of Oracle Corporation and/or its affiliates. Other names may be trademarks of their respective owners.