WorkingWithSVNBranches - Revision history

Frigory: Well, the template includes the category

2016-07-10T04:40:41Z

Well, the template includes the category

← Older revision		Revision as of 04:40, 10 July 2016
Line 51:		Line 51:

	If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.		If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.

	~~[[Category:Wiki Attic]]~~

Frigory: From developer doc to wiki attic

2016-07-10T04:30:34Z

From developer doc to wiki attic

← Older revision		Revision as of 04:30, 10 July 2016
Line 1:		Line 1:
			{{Outdated}}

	(This began as a copy of [[WorkingWithCVSBranches]]; bear with us as we update it to reflect SVN)		(This began as a copy of [[WorkingWithCVSBranches]]; bear with us as we update it to reflect SVN)

	~~===~~== Starting Work on an Existing Branch ~~===~~==		== Starting Work on an Existing Branch ==

	* checking out a specific branch of MODULE into DIR		* checking out a specific branch of MODULE into DIR
Line 7:		Line 9:
	svn checkout https://inkscape.svn.sourceforge.net/svnroot/inkscape/MODULE/branches/BRANCH DIR		svn checkout https://inkscape.svn.sourceforge.net/svnroot/inkscape/MODULE/branches/BRANCH DIR

	~~===~~== Making Your Own Branch ~~===~~==		== Making Your Own Branch ==

	:1. Copy the trunk to a new branch:		:1. Copy the trunk to a new branch:
Line 17:		Line 19:
	svn checkout https://svn.sourceforge.net/svnroot/inkscape/inkscape/branches/MY_BRANCH_NAME inkscape-MY_BRANCH_NAME		svn checkout https://svn.sourceforge.net/svnroot/inkscape/inkscape/branches/MY_BRANCH_NAME inkscape-MY_BRANCH_NAME

			== Merging Your Changes ==
	~~===~~== Merging Your Changes ~~===~~==
	For svn, rewrite the following section with material from [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html Copying Changes Between Branches] and [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html Common Use-Cases].		For svn, rewrite the following section with material from [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html Copying Changes Between Branches] and [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html Common Use-Cases].

Line 51:		Line 52:
	If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.		If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.

	[[Category:~~Developer Documentation~~]]		[[Category:Wiki Attic]]

Bohrax: /* Merging Your Changes */

2008-08-16T20:58:58Z

Merging Your Changes

← Older revision		Revision as of 20:58, 16 August 2008
Line 19:		Line 19:

	===== Merging Your Changes =====		===== Merging Your Changes =====
			For svn, rewrite the following section with material from [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html Copying Changes Between Branches] and [http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html Common Use-Cases].

			TODO: Update for svn.
	:1. Commit your work and resolve any conflicts		:1. Commit your work and resolve any conflicts

BryceHarrington at 02:02, 16 January 2007

2007-01-16T02:02:07Z

← Older revision		Revision as of 02:02, 16 January 2007
Line 5:		Line 5:
	* checking out a specific branch of MODULE into DIR		* checking out a specific branch of MODULE into DIR

	svn checkout https://svn.sourceforge.net/svnroot/inkscape/MODULE/branches/BRANCH DIR		svn checkout https://inkscape.svn.sourceforge.net/svnroot/inkscape/MODULE/branches/BRANCH DIR

	===== Making Your Own Branch =====		===== Making Your Own Branch =====

	:1. ~~Make~~ a branch ~~based on the revisions in your working copy (commit before you do this!)~~		:1. Copy the trunk to a new branch:

	~~cvs -z3 tag -b BRANCH~~		svn copy https://svn.sourceforge.net/svnroot/inkscape/inkscape/trunk https://svn.sourceforge.net/svnroot/inkscape/inkscape/branches/MY_BRANCH_NAME

	:2. ~~Switch your working copy to that BRANCH (as shown earlier)~~		:2. Checkout this branch:

	~~cvs~~ -~~z3 update -PAd -r BRANCH~~		svn checkout https://svn.sourceforge.net/svnroot/inkscape/inkscape/branches/MY_BRANCH_NAME inkscape-MY_BRANCH_NAME

	~~:3. Tag the initial revisions in your branch (you'll need this for merging easily)~~

	~~cvs -z3 tag [[BRANCH_START]]~~

	===== Merging Your Changes =====		===== Merging Your Changes =====

Colin Marquardt: +Category "Developer Documentation"

2006-06-20T13:48:12Z

+Category "Developer Documentation"

← Older revision		Revision as of 13:48, 20 June 2006
Line 51:		Line 51:

	If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.		If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.

			[[Category:Developer Documentation]]

Inkblotter at 04:19, 23 January 2006

2006-01-23T04:19:25Z

← Older revision		Revision as of 04:19, 23 January 2006
Line 1:		Line 1:
	(This began as a copy of [[WorkingWithCVSBranches]]; bear with us as we update it to reflect SVN)		(This began as a copy of [[WorkingWithCVSBranches]]; bear with us as we update it to reflect SVN)
	~~[http://www.hornyblog.org/bigtitpatrol/ [[BigTitPatrol]]]~~
	~~[http://www.hornyblog.org/asstraffic/ Asstraffic]~~
	~~[http://www.hornyblog.org/allinternal/ Allinternal]~~
	~~[http://www.hornyblog.org/creampiesurprise/ [[CreampieSurprise]]]~~
	~~[http://www.hornyblog.org/spermswap/ Spermswap]~~
	~~[http://www.hornyblog.org/mrchewsasianbeaver/ [[MrChewsAsianBeaver]] ]~~
	~~[http://www.hornyblog.org/adultfreindfinder/ [[AdultFreindFinder]] ]~~
	~~[http://www.hornyblog.org/givemepink/ [[GiveMePink]] ]~~
	~~[http://www.hornyblog.org/fastsize/ [[FastSize]] ]~~
	~~[http://www.hornyblog.org/bigmouthfuls/ [[BigMouthfuls]] ]~~
	~~[http://www.hornyblog.org/tugjobs/ [[TugJobs]] ]~~
	~~[http://www.itsporn.net/asstraffic/ Asstraffic]~~
	~~[http://www.itsporn.net/allinternal/ Allinternal]~~
	~~[http://www.itsporn.net/givemepink/ [[GiveMePink]] ]~~
	~~[http://www.itsporn.net/spermswap/ Spermswap]~~

	===== Starting Work on an Existing Branch =====		===== Starting Work on an Existing Branch =====

Conversion script: link fix

2006-01-22T02:33:51Z

link fix

New page

(This began as a copy of [[WorkingWithCVSBranches]]; bear with us as we update it to reflect SVN)
[http://www.hornyblog.org/bigtitpatrol/ [[BigTitPatrol]]]
[http://www.hornyblog.org/asstraffic/ Asstraffic]
[http://www.hornyblog.org/allinternal/ Allinternal]
[http://www.hornyblog.org/creampiesurprise/ [[CreampieSurprise]]]
[http://www.hornyblog.org/spermswap/ Spermswap]
[http://www.hornyblog.org/mrchewsasianbeaver/ [[MrChewsAsianBeaver]] ]
[http://www.hornyblog.org/adultfreindfinder/ [[AdultFreindFinder]] ]
[http://www.hornyblog.org/givemepink/ [[GiveMePink]] ]
[http://www.hornyblog.org/fastsize/ [[FastSize]] ]
[http://www.hornyblog.org/bigmouthfuls/ [[BigMouthfuls]] ]
[http://www.hornyblog.org/tugjobs/ [[TugJobs]] ]
[http://www.itsporn.net/asstraffic/ Asstraffic]
[http://www.itsporn.net/allinternal/ Allinternal]
[http://www.itsporn.net/givemepink/ [[GiveMePink]] ]
[http://www.itsporn.net/spermswap/ Spermswap]

===== Starting Work on an Existing Branch =====

* checking out a specific branch of MODULE into DIR

svn checkout https://svn.sourceforge.net/svnroot/inkscape/MODULE/branches/BRANCH DIR

===== Making Your Own Branch =====

:1. Make a branch based on the revisions in your working copy (commit before you do this!)

cvs -z3 tag -b BRANCH

:2. Switch your working copy to that BRANCH (as shown earlier)

cvs -z3 update -PAd -r BRANCH

:3. Tag the initial revisions in your branch (you'll need this for merging easily)

cvs -z3 tag [[BRANCH_START]]

===== Merging Your Changes =====

:1. Commit your work and resolve any conflicts

:2. Tag the revisions for this merge

cvs -z3 tag [[BRANCH_MERGE]]

:3. Switch your working copy back to the branch you want to merge to (HEAD is the default if you don't specify a branch with -j)

cvs -z3 update -PAd -r [[OTHER_BRANCH]]

:4. Merge the changes between [[BRANCH_START]] and [[BRANCH_MERGE]] into your working copy

cvs -z3 update -Pd -j [[BRANCH_START]] -j [[BRANCH_MERGE]]

:5. Check for any conflicts and commit the changes

If you want to work on BRANCH some more, you'll need to switch your working copy back to BRANCH again.

For future merges, you'll need to tag the revisions for those merges with unique tags (e.g. [[BRANCH_MERGE_2]], [[BRANCH_MERGE_3]], etc...), and only merge the changes between the previous merge and the new one.

This is so you don't end up merging the same set of changes twice.
Example:

First merge: -j [[BRANCH_START]] -j [[BRANCH_MERGE]]
Second merge: -j [[BRANCH_MERGE]] -j [[BRANCH_MERGE_2]]
Third merge: -j [[BRANCH_MERGE_2]] -j [[BRANCH_MERGE_3]]

If you merge to another branch that you've never merged to before, you'll need to merge from [[BRANCH_START]] up through [[BRANCH_MERGE_3]] to catch up.