Essential CVS/Using CVS/Multiple Users - 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 46:		Line 46:
	</div></li>		</div></li>

-	<li><div>Issue the ''cvs watch add'' ~~command''''to~~ set yourself as a watcher of the files you want to watch.	+	<li><div>Issue the ''cvs watch add'' commandto set yourself as a watcher of the files you want to watch.
	</div></li>		</div></li>

Line 221:		Line 221:
	Before editing a watched file, you should use the ''cvs editors'' command to see whether anyone else has issued ''cvs edit'' to indicate they are editing the file. You might also want to know who is watching the file you're about to edit.		Before editing a watched file, you should use the ''cvs editors'' command to see whether anyone else has issued ''cvs edit'' to indicate they are editing the file. You might also want to know who is watching the file you're about to edit.

-	The ''cvs watchers filename'' ~~command''''lists~~ the people currently watching the file, showing their email addresses stored in the ''notify'' or ''users'' files in the repository's ''CVSROOT'' directory.	+	The ''cvs watchers filename'' commandlists the people currently watching the file, showing their email addresses stored in the ''notify'' or ''users'' files in the repository's ''CVSROOT'' directory.

	The ''cvs editors filename'' command lists the people currently editing the file, their email addresses, the time they began working with the file, and the host and path of the directory containing the file.		The ''cvs editors filename'' command lists the people currently editing the file, their email addresses, the time they began working with the file, and the host and path of the directory containing the file.
Line 543:		Line 543:

	bash-2.05a$ '''cvs log main.c'''		bash-2.05a$ '''cvs log main.c'''
-	~~'' ''~~	+
	RCS file: /var/lib/cvs/wizzard/src/main.c,v		RCS file: /var/lib/cvs/wizzard/src/main.c,v
	Working file: main.c		Working file: main.c

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 75:		Line 75:

	<div id="cvs-CHP-5-EX-1">		<div id="cvs-CHP-5-EX-1">
-	'''Example II-43. CVSROOT/notify'''	+	'''Example 5-1. CVSROOT/notify'''

	ALL mail %s -s "CVS Notification"		ALL mail %s -s "CVS Notification"
Line 88:		Line 88:

	<div id="cvs-CHP-5-EX-2">		<div id="cvs-CHP-5-EX-2">
-	'''Example II-44. CVSROOT/users'''	+	'''Example 5-2. CVSROOT/users'''

	jenn:jenn@helit.nosuch.com		jenn:jenn@helit.nosuch.com
Line 115:		Line 115:

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

	bash-2.05a$ '''cvs watch on Makefile'''		bash-2.05a$ '''cvs watch on Makefile'''
Line 127:		Line 127:

	<div id="cvs-CHP-5-EX-4">		<div id="cvs-CHP-5-EX-4">
-	'''Example II-46. Mail from CVS'''	+	'''Example 5-4. Mail from CVS'''

	From: doppel@nosuch.com		From: doppel@nosuch.com
Line 148:		Line 148:

	<div id="cvs-CHP-5-EX-5">		<div id="cvs-CHP-5-EX-5">
-	'''Example II-47. Using cvs watch options'''	+	'''Example 5-5. Using cvs watch options'''

	bash-2.05a$ '''cvs watch add -l -a commit . '''		bash-2.05a$ '''cvs watch add -l -a commit . '''
Line 228:		Line 228:

	<div id="cvs-CHP-5-EX-6">		<div id="cvs-CHP-5-EX-6">
-	'''Example II-48. Using cvs watchers and cvs editors'''	+	'''Example 5-6. Using cvs watchers and cvs editors'''

	bash-2.05a$ '''cvs watchers'''		bash-2.05a$ '''cvs watchers'''
Line 275:		Line 275:

	<div id="cvs-CHP-5-EX-7">		<div id="cvs-CHP-5-EX-7">
-	'''Example II-49. Configuring commitinfo to include rcslock'''	+	'''Example 5-7. Configuring commitinfo to include rcslock'''

	^wizzard$/\\|$$ /usr/local/lib/cvs/rcslock		^wizzard$/\\|$$ /usr/local/lib/cvs/rcslock
Line 291:		Line 291:

	<div id="cvs-CHP-5-EX-8">		<div id="cvs-CHP-5-EX-8">
-	'''Example II-50. Failing to lock a reserved file'''	+	'''Example 5-8. Failing to lock a reserved file'''

	bash-2.05a$''' cvs admin -l Makefile'''		bash-2.05a$''' cvs admin -l Makefile'''
Line 301:		Line 301:

	<div id="cvs-CHP-5-EX-9">		<div id="cvs-CHP-5-EX-9">
-	'''Example II-51. Locking with rcslock'''	+	'''Example 5-9. Locking with rcslock'''

	doppel@teppic$''' cvs admin -l Makefile '''		doppel@teppic$''' cvs admin -l Makefile '''
Line 314:		Line 314:

	<div id="cvs-CHP-5-EX-10">		<div id="cvs-CHP-5-EX-10">
-	'''Example II-52. Failing to commit a reserved file'''	+	'''Example 5-10. Failing to commit a reserved file'''

	jenn@helit$ '''cvs commit Makefile'''		jenn@helit$ '''cvs commit Makefile'''
Line 324:		Line 324:

	<div id="cvs-CHP-5-EX-11">		<div id="cvs-CHP-5-EX-11">
-	'''Example II-53. Committing a reserved file'''	+	'''Example 5-11. Committing a reserved file'''

	jenn@helit$''' cvs commit Makefile'''		jenn@helit$''' cvs commit Makefile'''
Line 338:		Line 338:

	<div id="cvs-CHP-5-EX-12">		<div id="cvs-CHP-5-EX-12">
-	'''Example II-54. Unlocking with rcslock'''	+	'''Example 5-12. Unlocking with rcslock'''

	doppel@teppic$''' cvs admin -u Makefile '''		doppel@teppic$''' cvs admin -u Makefile '''
Line 353:		Line 353:

	<div id="cvs-CHP-5-EX-13">		<div id="cvs-CHP-5-EX-13">
-	'''Example II-55. Script for cvs edit and cvs admin -l'''	+	'''Example 5-13. Script for cvs edit and cvs admin -l'''

	#! /bin/sh		#! /bin/sh
Line 384:		Line 384:

	<div id="cvs-CHP-5-EX-14">		<div id="cvs-CHP-5-EX-14">
-	'''Example II-56. Using cvs diff'''	+	'''Example 5-14. Using cvs diff'''

	bash-2.05a$ '''cvs diff -c -r 1.2 -r 1.3 Makefile'''		bash-2.05a$ '''cvs diff -c -r 1.2 -r 1.3 Makefile'''
Line 461:		Line 461:

	<div id="cvs-CHP-5-EX-15">		<div id="cvs-CHP-5-EX-15">
-	'''Example II-57. Making a patch file'''	+	'''Example 5-15. Making a patch file'''

	bash-2.05a$ '''cvs rdiff -r 1.1 -r HEAD wizzard/src/handheld.c > patchfile'''		bash-2.05a$ '''cvs rdiff -r 1.1 -r HEAD wizzard/src/handheld.c > patchfile'''
Line 472:		Line 472:

	<div id="cvs-CHP-5-EX-16">		<div id="cvs-CHP-5-EX-16">
-	'''Example II-58. Displaying diff side-by-side'''	+	'''Example 5-16. Displaying diff side-by-side'''

	bash-2.05a$ '''cvs diff -y server.c'''		bash-2.05a$ '''cvs diff -y server.c'''
Line 503:		Line 503:

	<div id="cvs-CHP-5-EX-17">		<div id="cvs-CHP-5-EX-17">
-	'''Example II-59. Using cvs annotate'''	+	'''Example 5-17. Using cvs annotate'''

	bash-2.05a$ '''cvs annotate src/wizzard.h'''		bash-2.05a$ '''cvs annotate src/wizzard.h'''
Line 540:		Line 540:

	<div id="cvs-CHP-5-EX-18">		<div id="cvs-CHP-5-EX-18">
-	'''Example II-60. Using cvs log'''	+	'''Example 5-18. Using cvs log'''

	bash-2.05a$ '''cvs log main.c'''		bash-2.05a$ '''cvs log main.c'''

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}}
-
-
	This chapter explains how CVS can be used for source or content control — how to manage a group of developers working together on a project without having them overwrite each other's work, causing loss of data. It also describes commands that show what each person has done to a file.		This chapter explains how CVS can be used for source or content control — how to manage a group of developers working together on a project without having them overwrite each other's work, causing loss of data. It also describes commands that show what each person has done to a file.