MCL/sftools/dev/eclipseenv/buildlayout34: carbidecpp20devenv/plugins/org.eclipse.platform_3.3.101.v200809111700/cheatsheets/cvs

1 82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	1	<?xml version="1.0" encoding="UTF-8" ?>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	2	<cheatsheet title="Merge CVS branches">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	3
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	4	<intro
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	5	href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	6	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	7	This cheat sheet shows you the steps to merge changes from one CVS branch
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	8	into another, or into HEAD. If you need help at any step, click on the (?)
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	9	icon to the right.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	10	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	11	</intro>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	12
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	13	<item
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	14	href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	15	title="Determine branch and version information">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	16	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	17	The first step is to decide <b>which</b> two branches will be merged, at
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	18	which <b>version</b> the content was branched, and what the
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	19	<b>destination</b> branch will be (where the result of the merge will go).
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	20	Once you have this information, you can move on to the next step.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	21	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	22	</item>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	23
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	24	<item
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	25	href="/org.eclipse.platform.doc.user/tasks/tasks-96.htm"
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	26	title="Check out the project">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	27	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	28	Before merging, you must <b>check out</b> the project you wish to merge
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	29	and bring it into your workspace. You can do this either via the import
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	30	wizard or by adding your repository from the CVS Repository Exploring
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	31	perspective, or click the (?) button for help.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	32	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	33	</item>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	34
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	35	<item
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	36	href="/org.eclipse.platform.doc.user/tasks/tasks-103.htm"
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	37	title="Load the destination into your workspace">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	38	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	39	In the navigator, right-click on the project and select Replace With >
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	40	Another Branch or Version. Select the destination branch. This will load
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	41	the branch's latest content into your workspace.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	42	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	43	</item>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	44
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	45	<item
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	46	href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	47	title="Merge details">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	48	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	49	Again in the navigator, right-click on the project and select <b>Team</b>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	50	> <b>Merge</b> and complete the steps in the wizard. In this wizard you
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	51	specify the details of the merge.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	52	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	53	</item>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	54
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	55	<item
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	56	href="/org.eclipse.platform.doc.user/tasks/tasks-100b.htm"
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	57	title="Work with the Merge editor">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	58	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	59	In the Merge editor manually merge the changes. This step loads the
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	60	required changes into the workspace. Once you've merged all the changes
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	61	and are satisfied with the result, move on to the next step.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	62	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	63	</item>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	64
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	65	<item
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	66	href="/org.eclipse.platform.doc.user/tasks/tasks-114.htm"
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	67	title="Commit your changes">
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	68	<description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	69	Right-click on the project and select <b>Team</b> > <b>Synchronize with
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	70	Repository</b> and then commit all the changes to the repository. This
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	71	step finalizes the transfer of the changes from the workspace to the CVS
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	72	repository, and finalizes the merge.
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	73	</description>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	74	</item>
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	75
82d1d1de1a01 import Carbide.c++ cawthron parents: diff changeset	76	</cheatsheet>

author	cawthron
	Wed, 18 Mar 2009 17:21:00 -0500
changeset 1	82d1d1de1a01
permissions	-rw-r--r--