Essential CVS/Using CVS/Basic Use of CVS - Revision history

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T13:08:35Z

Initial conversion from Docbook

←Older revision

Revision as of 13:08, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T12:42:12Z

Initial conversion from Docbook

←Older revision		Revision as of 12:42, 7 March 2008
Line 36:		Line 36:
	CVS commands follow the syntax:		CVS commands follow the syntax:

-	cvs~~'' ''~~[''cvs-options'']'' command ''[''command-options'']~~'' ''~~[''arguments'']	+	cvs [''cvs-options'']'' command ''[''command-options''] [''arguments'']

	The ''cvs-options''modify the behavior of CVS as a whole, and their functions include help, quiet operation, changing the default editor, and changing the CVS root directory.		The ''cvs-options''modify the behavior of CVS as a whole, and their functions include help, quiet operation, changing the default editor, and changing the CVS root directory.
Line 601:		Line 601:


-	This command uses the ''-p'' option of ''cvs update''to ~~write''''the~~ specified revision to ''stdout''. That output is then redirected to ''filename'' using the > shell operator. The''>'' operator is a shell redirection operator and may vary depending on the shell you use. The''> filename'' part of the command is processed by the shell; it is not passed to CVS.	+	This command uses the ''-p'' option of ''cvs update''to writethe specified revision to ''stdout''. That output is then redirected to ''filename'' using the > shell operator. The''>'' operator is a shell redirection operator and may vary depending on the shell you use. The''> filename'' part of the command is processed by the shell; it is not passed to CVS.

	[[Essential CVS/Using CVS/Basic Use of CVS#cvs-CHP-3-EX-10\|Example 3-10]] reverts the corrected revision of ''wizzard.h'' to the corrupted revision, using the ''-p''option. The ''less'' command shows the contents of the file after the reversion.		[[Essential CVS/Using CVS/Basic Use of CVS#cvs-CHP-3-EX-10\|Example 3-10]] reverts the corrected revision of ''wizzard.h'' to the corrupted revision, using the ''-p''option. The ''less'' command shows the contents of the file after the reversion.
Line 734:		Line 734:
	Use ''cvs add'' to add a file or directory to the repository. Using ''cvs add'' on a file marks the file as needing to be added when ''cvs commit'' is run. Running ''cvs add'' on a directory adds the directory to the repository and the ''CVS'' subdirectory to the directory.		Use ''cvs add'' to add a file or directory to the repository. Using ''cvs add'' on a file marks the file as needing to be added when ''cvs commit'' is run. Running ''cvs add'' on a directory adds the directory to the repository and the ''CVS'' subdirectory to the directory.

-	The ''Attic'' and ''CVS''~~directories''''are~~ special directories that CVS uses for its own purposes. Do not make a file or directory with these names.	+	The ''Attic'' and ''CVS''directoriesare special directories that CVS uses for its own purposes. Do not make a file or directory with these names.

	<div class="tip">		<div class="tip">
Line 769:		Line 769:

	bash-2.05a$''' cvs add design plan design/.rtf plan/.rtf'''		bash-2.05a$''' cvs add design plan design/.rtf plan/.rtf'''
-	~~'' ''~~	+
	Directory /var/lib/cvs/wizzard/doc/design added to the repository		Directory /var/lib/cvs/wizzard/doc/design added to the repository
	Directory /var/lib/cvs/wizzard/doc/plan added to the repository		Directory /var/lib/cvs/wizzard/doc/plan added to the repository
Line 1,174:		Line 1,174:
	'''Tip'''		'''Tip'''

-	The ''cvs log'' command displays all the information that the ''Log''~~keyword''''provides~~''.''	+	The ''cvs log'' command displays all the information that the ''Log''keywordprovides''.''
	</div>		</div>

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T12:36:38Z

Initial conversion from Docbook

←Older revision

Revision as of 12:36, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T12:30:30Z

Initial conversion from Docbook

←Older revision

Revision as of 12:30, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T12:25:01Z

Initial conversion from Docbook

←Older revision

Revision as of 12:25, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T11:52:13Z

Initial conversion from Docbook

←Older revision

Revision as of 11:52, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T11:47:08Z

Initial conversion from Docbook

(Difference between revisions)

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T11:44:08Z

Initial conversion from Docbook

←Older revision		Revision as of 11:44, 7 March 2008
Line 11:		Line 11:

	<div id="cvs-CHP-3-FIG-1">		<div id="cvs-CHP-3-FIG-1">
-	'''Figure II-1. Repository and sandboxes'''	+	'''Figure 3-1. Repository and sandboxes'''

	[[Image:Essential CVS_I_1_tt18.png\|Repository and sandboxes]]		[[Image:Essential CVS_I_1_tt18.png\|Repository and sandboxes]]
Line 25:		Line 25:

	<div id="cvs-CHP-3-EX-1">		<div id="cvs-CHP-3-EX-1">
-	'''Example II-1. Lock message'''	+	'''Example 3-1. Lock message'''

	cvs server: [''23:20:43''] waiting for jenn's lock in /var/lib/cvs/wizzard/src		cvs server: [''23:20:43''] waiting for jenn's lock in /var/lib/cvs/wizzard/src
Line 178:		Line 178:

	<div id="cvs-CHP-3-EX-2">		<div id="cvs-CHP-3-EX-2">
-	'''Example II-2. Using cvs checkout'''	+	'''Example 3-2. Using cvs checkout'''

	bash-2.05a$ '''ls'''		bash-2.05a$ '''ls'''
Line 250:		Line 250:

	<div id="cvs-CHP-3-EX-3">		<div id="cvs-CHP-3-EX-3">
-	'''Example II-3. Using cvs commit'''	+	'''Example 3-3. Using cvs commit'''

	/home/jenn/cvs/wizzard$ '''cvs commit'''		/home/jenn/cvs/wizzard$ '''cvs commit'''
Line 277:		Line 277:

	<div id="cvs-CHP-3-EX-4">		<div id="cvs-CHP-3-EX-4">
-	'''Example II-4. Entering log messages for cvs commit'''	+	'''Example 3-4. Entering log messages for cvs commit'''

	'''Added main.c: parses parameters and calls functions in other files.'''		'''Added main.c: parses parameters and calls functions in other files.'''
Line 353:		Line 353:

	<div id="cvs-CHP-3-EX-5">		<div id="cvs-CHP-3-EX-5">
-	'''Example II-5. Output from the cvs status command'''	+	'''Example 3-5. Output from the cvs status command'''

	= = = = = = = = = = = = = = = = = = = = = = = = = = = = = =		= = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
Line 411:		Line 411:

	<div id="cvs-CHP-3-EX-6">		<div id="cvs-CHP-3-EX-6">
-	'''Example II-6. Using cvs update'''	+	'''Example 3-6. Using cvs update'''

	bash-2.05a$ '''cvs update -d'''		bash-2.05a$ '''cvs update -d'''
Line 507:		Line 507:

	<div id="cvs-CHP-3-EX-7">		<div id="cvs-CHP-3-EX-7">
-	'''Example II-7. cvs log output'''	+	'''Example 3-7. cvs log output'''

	RCS file: /var/lib/cvs/wizzard/src/wizzard.h,v		RCS file: /var/lib/cvs/wizzard/src/wizzard.h,v
Line 544:		Line 544:

	<div id="cvs-CHP-3-EX-8">		<div id="cvs-CHP-3-EX-8">
-	'''Example II-8. Retrieval by revision number'''	+	'''Example 3-8. Retrieval by revision number'''

	bash-2.05a$ '''cvs update -r 1.2 src/wizzard.h'''		bash-2.05a$ '''cvs update -r 1.2 src/wizzard.h'''
Line 570:		Line 570:

	<div id="cvs-CHP-3-EX-9">		<div id="cvs-CHP-3-EX-9">
-	'''Example II-9. Reverting changes with update -j'''	+	'''Example 3-9. Reverting changes with update -j'''

	bash-2.05a$ '''less wizzard.h'''		bash-2.05a$ '''less wizzard.h'''
Line 606:		Line 606:

	<div id="cvs-CHP-3-EX-10">		<div id="cvs-CHP-3-EX-10">
-	'''Example II-10. Reverting changes with update -r -p'''	+	'''Example 3-10. Reverting changes with update -r -p'''

	bash-2.05a$ '''cvs update -r 1.3 -p > wizzard.h'''		bash-2.05a$ '''cvs update -r 1.3 -p > wizzard.h'''
Line 644:		Line 644:

	<div id="cvs-CHP-3-EX-11">		<div id="cvs-CHP-3-EX-11">
-	'''Example II-11. Retrieving with update -D'''	+	'''Example 3-11. Retrieving with update -D'''

	bash-2.05a$ '''cvs update -D 2002-09-13 14:00 src/wizzard.h'''		bash-2.05a$ '''cvs update -D 2002-09-13 14:00 src/wizzard.h'''
Line 671:		Line 671:

	<div id="cvs-CHP-3-EX-12">		<div id="cvs-CHP-3-EX-12">
-	'''Example II-12. File merge and conflict during update'''	+	'''Example 3-12. File merge and conflict during update'''

	bash-2.05a$ '''cvs update'''		bash-2.05a$ '''cvs update'''
Line 704:		Line 704:

	<div id="cvs-CHP-3-EX-13">		<div id="cvs-CHP-3-EX-13">
-	'''Example II-13. Conflicts in a file'''	+	'''Example 3-13. Conflicts in a file'''

	<<<<<<< main.c		<<<<<<< main.c
Line 766:		Line 766:

	<div id="cvs-CHP-3-EX-14">		<div id="cvs-CHP-3-EX-14">
-	'''Example II-14. Using cvs add'''	+	'''Example 3-14. Using cvs add'''

	bash-2.05a$''' cvs add design plan design/.rtf plan/.rtf'''		bash-2.05a$''' cvs add design plan design/.rtf plan/.rtf'''
Line 812:		Line 812:

	<div id="cvs-CHP-3-EX-15">		<div id="cvs-CHP-3-EX-15">
-	'''Example II-15. Using cvs remove'''	+	'''Example 3-15. Using cvs remove'''

	bash-2.05a$ '''ls'''		bash-2.05a$ '''ls'''
Line 873:		Line 873:

	<div id="cvs-CHP-3-EX-16">		<div id="cvs-CHP-3-EX-16">
-	'''Example II-16. Retrieving a removed file, method 1'''	+	'''Example 3-16. Retrieving a removed file, method 1'''

	bash-2.05a$ '''touch main.c'''		bash-2.05a$ '''touch main.c'''
Line 899:		Line 899:

	<div id="cvs-CHP-3-EX-17">		<div id="cvs-CHP-3-EX-17">
-	'''Example II-17. Retrieving a removed file, method 2'''	+	'''Example 3-17. Retrieving a removed file, method 2'''

	bash-2.05a$ '''cvs update -r 1.5 -p main.c > main.c'''		bash-2.05a$ '''cvs update -r 1.5 -p main.c > main.c'''
Line 927:		Line 927:

	<div id="cvs-CHP-3-EX-18">		<div id="cvs-CHP-3-EX-18">
-	'''Example II-18. Retrieving a removed file, method 3'''	+	'''Example 3-18. Retrieving a removed file, method 3'''

	bash-2.05a$ '''cvs update -j 1.8 -j 1.7 main.c'''		bash-2.05a$ '''cvs update -j 1.8 -j 1.7 main.c'''
Line 969:		Line 969:

	<div id="cvs-CHP-3-EX-19">		<div id="cvs-CHP-3-EX-19">
-	'''Example II-19. Renaming a file'''	+	'''Example 3-19. Renaming a file'''

	bash-2.05a$ '''mv wizzard.h config.h'''		bash-2.05a$ '''mv wizzard.h config.h'''
Line 1,032:		Line 1,032:

	<div id="cvs-CHP-3-EX-20">		<div id="cvs-CHP-3-EX-20">
-	'''Example II-20. Using cvs release'''	+	'''Example 3-20. Using cvs release'''

	bash-2.05a$ '''cvs release .'''		bash-2.05a$ '''cvs release .'''
Line 1,056:		Line 1,056:

	<div id="cvs-CHP-3-EX-21">		<div id="cvs-CHP-3-EX-21">
-	'''Example II-21. CVS keywords'''	+	'''Example 3-21. CVS keywords'''

	# Makefile for the Wizzard project		# Makefile for the Wizzard project
Line 1,109:		Line 1,109:

	<div id="cvs-CHP-3-EX-22">		<div id="cvs-CHP-3-EX-22">
-	'''Example II-22. Expanded keywords'''	+	'''Example 3-22. Expanded keywords'''

	# Current revision $Revision: 1.6 $		# Current revision $Revision: 1.6 $
Line 1,229:		Line 1,229:

	<div id="cvs-CHP-3-EX-23">		<div id="cvs-CHP-3-EX-23">
-	'''Example II-23. Setting keyword expansion for binary files'''	+	'''Example 3-23. Setting keyword expansion for binary files'''

	bash-2.05a$ '''cvs add -kb Requirements.doc '''		bash-2.05a$ '''cvs add -kb Requirements.doc '''
Line 1,291:		Line 1,291:

	<div id="cvs-CHP-3-EX-24">		<div id="cvs-CHP-3-EX-24">
-	'''Example II-24. Using cvs update with wrappers'''	+	'''Example 3-24. Using cvs update with wrappers'''

	bash-2.05a$''' cvs update -W"Ma\* -k 'v'"'''		bash-2.05a$''' cvs update -W"Ma\* -k 'v'"'''
Line 1,327:		Line 1,327:

	<div id="cvs-CHP-3-EX-25">		<div id="cvs-CHP-3-EX-25">
-	'''Example II-25. A .cvsrc file'''	+	'''Example 3-25. A .cvsrc file'''

	add -m "Part of the wizzard project"		add -m "Part of the wizzard project"

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T11:37:08Z

Initial conversion from Docbook

←Older revision

Revision as of 11:37, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

2008-03-07T11:31:56Z

Initial conversion from Docbook

←Older revision		Revision as of 11:31, 7 March 2008
Line 1:		Line 1:
	{{Essential CVS/TOC}}		{{Essential CVS/TOC}}
-
-
	This chapter provides a thorough discussion of the most critical CVS commands and topics. It is designed for end users who will not have to administrate the repository and who will not have to make changes that affect the entire project.		This chapter provides a thorough discussion of the most critical CVS commands and topics. It is designed for end users who will not have to administrate the repository and who will not have to make changes that affect the entire project.