Essential CVS/CVS Administration/Project Management - Revision history

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 13:08:35 GMT

Initial conversion from Docbook

←Older revision

Revision as of 13:08, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 12:42:12 GMT

Initial conversion from Docbook

←Older revision		Revision as of 12:42, 7 March 2008
Line 94:		Line 94:
	=== Vendor Branches ===		=== Vendor Branches ===

-	A vendor ~~branch''''is~~ a special type of branch that CVS creates automatically when you ''cvs import'' a project. If your project is based on code external to the project itself, such as in-house patches to a vendor's code base, the vendor branch provides a way to merge updates from the external source with your own code.	+	A vendor branchis a special type of branch that CVS creates automatically when you ''cvs import'' a project. If your project is based on code external to the project itself, such as in-house patches to a vendor's code base, the vendor branch provides a way to merge updates from the external source with your own code.

-	If you intend to use vendor branches, use ''cvs import'' to create your project in CVS, using the vendor's code as the initial directory for the project. Make your changes on the main trunk and run the project normally; the ~~vendor''''branch~~ is used only when the vendor releases a new set of code.	+	If you intend to use vendor branches, use ''cvs import'' to create your project in CVS, using the vendor's code as the initial directory for the project. Make your changes on the main trunk and run the project normally; the vendorbranch is used only when the vendor releases a new set of code.

-	When the vendor provides a new release, use the ''cvs import'' command to add the new code to the same CVS project with the same ~~vendor''''tag~~ and a new ~~release''''tag~~. In effect, this is a special ''cvs commit'' to the ~~vendor''''branch~~.	+	When the vendor provides a new release, use the ''cvs import'' command to add the new code to the same CVS project with the same vendortag and a new releasetag. In effect, this is a special ''cvs commit'' to the vendorbranch.

-	[[Essential CVS/CVS Administration/Project Management#cvs-CHP-7-EX-2\|Example 7-2]] shows a vendor-branch import to the ''wizzard'' project. Note the new ~~release''''tag~~. The project name and ~~vendor''''tag~~ remain the same as in [[Essential CVS/CVS Administration/Project Management#cvs-CHP-7-EX-1\|Example 7-1]].	+	[[Essential CVS/CVS Administration/Project Management#cvs-CHP-7-EX-2\|Example 7-2]] shows a vendor-branch import to the ''wizzard'' project. Note the new releasetag. The project name and vendortag remain the same as in [[Essential CVS/CVS Administration/Project Management#cvs-CHP-7-EX-1\|Example 7-1]].

	<div id="cvs-CHP-7-EX-2">		<div id="cvs-CHP-7-EX-2">
Line 125:		Line 125:
	</div>		</div>

-	If a file is changed on the ~~vendor''''branch~~ and the local file has not changed, CVS sets the trunk revision of the file to the new vendor''-''branch revision.	+	If a file is changed on the vendorbranch and the local file has not changed, CVS sets the trunk revision of the file to the new vendor''-''branch revision.

	If both the vendor-branch copy and the local copy of a file have changes, CVS reports this as a conflict with the message ''N conflicts created by this import'', where ''N''is the number of conflicts. CVS also provides a suggested variant of ''cvs checkout'' to help you resolve all the conflicts, using two ''-j'' command options to merge the vendor branch with the trunk.		If both the vendor-branch copy and the local copy of a file have changes, CVS reports this as a conflict with the message ''N conflicts created by this import'', where ''N''is the number of conflicts. CVS also provides a suggested variant of ''cvs checkout'' to help you resolve all the conflicts, using two ''-j'' command options to merge the vendor branch with the trunk.
Line 142:		Line 142:
	'''Tip'''		'''Tip'''

-	If the vendor branch contains binary files or files with keywords, use the keyword (''-k'')~~''''~~and wrappers (''-W'') command options to ''cvs import''. Keywords and wrappers are discussed in [[Essential CVS/Using CVS/Basic Use of CVS\|Chapter 3]].	+	If the vendor branch contains binary files or files with keywords, use the keyword (''-k'')and wrappers (''-W'') command options to ''cvs import''. Keywords and wrappers are discussed in [[Essential CVS/Using CVS/Basic Use of CVS\|Chapter 3]].
	</div>		</div>

Line 398:		Line 398:
	=== Common Syntax ===		=== Common Syntax ===

-	Most of the scripting ~~files''''in~~ ''CVSROOT --''including ''commitinfo'', ''loginfo'', ''editinfo'', ''rcsinfo'', and ''verifymsg'' — share a common syntax. The ''modules'' file does not use the common syntax.	+	Most of the scripting filesin ''CVSROOT --''including ''commitinfo'', ''loginfo'', ''editinfo'', ''rcsinfo'', and ''verifymsg'' — share a common syntax. The ''modules'' file does not use the common syntax.

	Each line of a file using the common syntax should contain the following items:		Each line of a file using the common syntax should contain the following items:
Line 587:		Line 587:
	"''variable_expansion'' [''variable_expansion''...]"		"''variable_expansion'' [''variable_expansion''...]"

-	The output includes a variable expansion for each file that was committed. The variable expansion is a comma-separated set of strings, such that ''%{sV}'' could be expanded to a string like ''main.c,1.3''. Dollar signs (''$''), backticks (`), backslashes (''\''),~~''''~~and quotation marks (''"'') in the repository path or filename are escaped with backslashes.	+	The output includes a variable expansion for each file that was committed. The variable expansion is a comma-separated set of strings, such that ''%{sV}'' could be expanded to a string like ''main.c,1.3''. Dollar signs (''$''), backticks (`), backslashes (''\''),and quotation marks (''"'') in the repository path or filename are escaped with backslashes.

	If you run ''cvs commit'' from a sandbox directory, CVS tries to match the repository path that corresponds to your current sandbox directory with a rule in ''loginfo''. If you run ''cvs commit'' with a file or directory parameter, CVS tries to match the repository path that corresponds to that parameter.		If you run ''cvs commit'' from a sandbox directory, CVS tries to match the repository path that corresponds to your current sandbox directory with a rule in ''loginfo''. If you run ''cvs commit'' with a file or directory parameter, CVS tries to match the repository path that corresponds to that parameter.
Line 828:		Line 828:
	''date''		''date''
	''timezone''		''timezone''
-	''user'' {''revision''\|''path''\|''branch''}~~'' ''~~{''module''\|''directory''\|''tag''\|''filename''}	+	''user'' {''revision''\|''path''\|''branch''} {''module''\|''directory''\|''tag''\|''filename''}
	[module\|''project-root-directory''] ''access_type''		[module\|''project-root-directory''] ''access_type''

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 12:36:38 GMT

Initial conversion from Docbook

←Older revision

Revision as of 12:36, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 12:30:30 GMT

Initial conversion from Docbook

←Older revision

Revision as of 12:30, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 12:25:01 GMT

Initial conversion from Docbook

←Older revision

Revision as of 12:25, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 11:52:13 GMT

Initial conversion from Docbook

←Older revision

Revision as of 11:52, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 11:47:08 GMT

Initial conversion from Docbook

(Difference between revisions)

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 11:44:08 GMT

Initial conversion from Docbook

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

	<div id="cvs-CHP-7-EX-1">		<div id="cvs-CHP-7-EX-1">
-	'''Example ~~III~~-18. Importing with cvs import'''	+	'''Example 7-1. Importing with cvs import'''

	bash-2.05a$''' cvs -d cvs:/var/lib/cvs import wizzard wizzard ver_1-0'''		bash-2.05a$''' cvs -d cvs:/var/lib/cvs import wizzard wizzard ver_1-0'''
Line 103:		Line 103:

	<div id="cvs-CHP-7-EX-2">		<div id="cvs-CHP-7-EX-2">
-	'''Example ~~III~~-19. Importing a vendor branch'''	+	'''Example 7-2. Importing a vendor branch'''

	bash-2.05a$ '''cvs -d cvs:/var/lib/cvs import wizzard wizzard ver_2-0'''		bash-2.05a$ '''cvs -d cvs:/var/lib/cvs import wizzard wizzard ver_2-0'''
Line 170:		Line 170:

	<div id="cvs-CHP-7-EX-3">		<div id="cvs-CHP-7-EX-3">
-	'''Example ~~III~~-20. Importing without cvs import'''	+	'''Example 7-3. Importing without cvs import'''

	bash-2.05a$ '''cvs -d cvs:/var/lib/cvs checkout -l -d cvsroot .'''		bash-2.05a$ '''cvs -d cvs:/var/lib/cvs checkout -l -d cvsroot .'''
Line 289:		Line 289:

	<div id="cvs-CHP-7-EX-4">		<div id="cvs-CHP-7-EX-4">
-	'''Example ~~III~~-21. Using cvs export'''	+	'''Example 7-4. Using cvs export'''

	bash-2.05a$ '''cvs -d cvs:/var/lib/cvs export -D now wizzard'''		bash-2.05a$ '''cvs -d cvs:/var/lib/cvs export -D now wizzard'''
Line 328:		Line 328:

	<div id="cvs-CHP-7-EX-5">		<div id="cvs-CHP-7-EX-5">
-	'''Example ~~III~~-22. Export cron script'''	+	'''Example 7-5. Export cron script'''

	cd /ftp/internal		cd /ftp/internal
Line 350:		Line 350:

	<div id="cvs-CHP-7-EX-6">		<div id="cvs-CHP-7-EX-6">
-	'''Example ~~III~~-23. Sample commitinfo file'''	+	'''Example 7-6. Sample commitinfo file'''

	^wizzard/src$/\\|$$ /var/lib/cvs/CVSROOT/indent-tester -gnu		^wizzard/src$/\\|$$ /var/lib/cvs/CVSROOT/indent-tester -gnu
Line 432:		Line 432:

	<div id="cvs-CHP-7-EX-7">		<div id="cvs-CHP-7-EX-7">
-	'''Example ~~III~~-24. CVSROOT/modules'''	+	'''Example 7-7. CVSROOT/modules'''

	# wizzard project. Project lead: jenn. Module type: regular.		# wizzard project. Project lead: jenn. Module type: regular.
Line 547:		Line 547:

	<div id="cvs-CHP-7-EX-8">		<div id="cvs-CHP-7-EX-8">
-	'''Example ~~III~~-25. Indentation tester'''	+	'''Example 7-8. Indentation tester'''

	INDENTOPTS=$1		INDENTOPTS=$1
Line 596:		Line 596:

	<div id="cvs-CHP-7-EX-9">		<div id="cvs-CHP-7-EX-9">
-	'''Example ~~III~~-26. A loginfo file'''	+	'''Example 7-9. A loginfo file'''

	^wizzard$/\\|$$ /var/lib/cvs/CVSROOT/changelog %{sv}		^wizzard$/\\|$$ /var/lib/cvs/CVSROOT/changelog %{sv}
Line 645:		Line 645:

	<div id="cvs-CHP-7-EX-10">		<div id="cvs-CHP-7-EX-10">
-	'''Example ~~III~~-27. Parsing tag names'''	+	'''Example 7-10. Parsing tag names'''

	$TAGNAME=$ARGV[0];		$TAGNAME=$ARGV[0];
Line 693:		Line 693:

	<div id="cvs-CHP-7-EX-11">		<div id="cvs-CHP-7-EX-11">
-	'''Example ~~III~~-28. Interfacing with Bugzilla, verifymsg'''	+	'''Example 7-11. Interfacing with Bugzilla, verifymsg'''

	#! /bin/bash		#! /bin/bash
Line 708:		Line 708:

	<div id="cvs-CHP-7-EX-12">		<div id="cvs-CHP-7-EX-12">
-	'''Example ~~III~~-29. Interfacing with Bugzilla, message template'''	+	'''Example 7-12. Interfacing with Bugzilla, message template'''

	@bugid		@bugid
Line 720:		Line 720:

	<div id="cvs-CHP-7-EX-13">		<div id="cvs-CHP-7-EX-13">
-	'''Example ~~III~~-30. Interfacing with Bugzilla, scripting files'''	+	'''Example 7-13. Interfacing with Bugzilla, scripting files'''

	# In verifymsg, call the script bugzilla-mail		# In verifymsg, call the script bugzilla-mail
Line 742:		Line 742:

	<div id="cvs-CHP-7-EX-14">		<div id="cvs-CHP-7-EX-14">
-	'''Example ~~III~~-31. Building for testing or publication'''	+	'''Example 7-14. Building for testing or publication'''

	/usr/bin/cvs -d cvs:/var/lib/cvs rtag -r HEAD $1 wizzard		/usr/bin/cvs -d cvs:/var/lib/cvs rtag -r HEAD $1 wizzard
Line 837:		Line 837:

	<div id="cvs-CHP-7-EX-15">		<div id="cvs-CHP-7-EX-15">
-	'''Example ~~III~~-32. cvs history command output'''	+	'''Example 7-15. cvs history command output'''

	bash-2.05a$ '''cvs history -e -zUTC'''		bash-2.05a$ '''cvs history -e -zUTC'''

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 11:37:08 GMT

Initial conversion from Docbook

←Older revision

Revision as of 11:37, 7 March 2008

Docbook2Wiki: Initial conversion from Docbook

Docbook2Wiki — Fri, 07 Mar 2008 11:31:56 GMT

Initial conversion from Docbook

←Older revision		Revision as of 11:31, 7 March 2008
Line 1:		Line 1:
	{{Essential CVS/TOC}}		{{Essential CVS/TOC}}
-
-
	The team leader responsible for a project needs to know more about the project's tools than most other developers, or he needs to have a team member who knows about the tools. This chapter is for the team leader and the CVS specialist on the team. It concentrates on the files and directories that make up a project and how they are stored and managed in CVS, rather than on managing the development process itself.		The team leader responsible for a project needs to know more about the project's tools than most other developers, or he needs to have a team member who knows about the tools. This chapter is for the team leader and the CVS specialist on the team. It concentrates on the files and directories that make up a project and how they are stored and managed in CVS, rather than on managing the development process itself.