Essential CVS/Using CVS/Tagging and Branching - 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 510:		Line 510:
	</div></li>		</div></li>

-	<li><div>Use the command ''cvs tag -b branchname'' to create the branch. The ''tag'' command tags the last revisions that ~~were''''committed~~ to the repository ~~or''''updated~~ from the repository, which hopefully are the revisions before the changes you want to branch off of. The ''cvs tag'' command does not modify your sandbox.	+	<li><div>Use the command ''cvs tag -b branchname'' to create the branch. The ''tag'' command tags the last revisions that werecommitted to the repository orupdated from the repository, which hopefully are the revisions before the changes you want to branch off of. The ''cvs tag'' command does not modify your sandbox.
	</div></li>		</div></li>

Line 652:		Line 652:
	If the trunk has previously been merged to the branch and you tagged the trunk at that point, the command ''cvs update -j lastmergetag -j HEAD'' in the same sandbox merges only the changes since the last merge tag.		If the trunk has previously been merged to the branch and you tagged the trunk at that point, the command ''cvs update -j lastmergetag -j HEAD'' in the same sandbox merges only the changes since the last merge tag.

-	[[Essential CVS/Using CVS/Tagging and Branching#cvs-CHP-4-EX-16\|Example 4-16]] shows the result and error messages caused by attempting to merge a trunk to a branch. The ''config.h''~~file''''has~~ been removed from the branch but is still active in the trunk. This issue needs to be resolved, probably by reverting the removal. The ''handheld.c'' file did not previously exist in the trunk but was added to the trunk in [[Essential CVS/Using CVS/Tagging and Branching#cvs-CHP-4-EX-15\|Example 4-15]] when the branch was merged to it; the related error message can be ignored.	+	[[Essential CVS/Using CVS/Tagging and Branching#cvs-CHP-4-EX-16\|Example 4-16]] shows the result and error messages caused by attempting to merge a trunk to a branch. The ''config.h''filehas been removed from the branch but is still active in the trunk. This issue needs to be resolved, probably by reverting the removal. The ''handheld.c'' file did not previously exist in the trunk but was added to the trunk in [[Essential CVS/Using CVS/Tagging and Branching#cvs-CHP-4-EX-15\|Example 4-15]] when the branch was merged to it; the related error message can be ignored.

	<div id="cvs-CHP-4-EX-16">		<div id="cvs-CHP-4-EX-16">

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

(Difference between revisions)

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}}
-
-
	One of the most helpful yet underused facilities of CVS is the ''tag'' . CVS's tagging feature allows you to label a revision for later retrieval. This feature also allows you to fork development so that you can work on two or more versions of your project simultaneously. The version that has been forked off is called a ''branch'' , and the main line of development is called the ''trunk'' .		One of the most helpful yet underused facilities of CVS is the ''tag'' . CVS's tagging feature allows you to label a revision for later retrieval. This feature also allows you to fork development so that you can work on two or more versions of your project simultaneously. The version that has been forked off is called a ''branch'' , and the main line of development is called the ''trunk'' .