Working with SVN - Revision history

Cadillac at 18:21, 24 August 2021

2021-08-24T18:21:39Z

← Older revision		Revision as of 14:21, 24 August 2021
Line 129:		Line 129:

	Your commits don't appear in "svn log" until you do "svn update". This is important for alpha builds. Always update before you make an alpha, or the ChangeLog will not reflect your latest changes, and the revision that the alpha will carry (later publicily in the version, for now as a fingerprint file) will be wrong.		Your commits don't appear in "svn log" until you do "svn update". This is important for alpha builds. Always update before you make an alpha, or the ChangeLog will not reflect your latest changes, and the revision that the alpha will carry (later publicily in the version, for now as a fingerprint file) will be wrong.

			[[Category:Development]]

69.86.116.157 at 07:32, 23 July 2007

2007-07-23T07:32:41Z

← Older revision		Revision as of 03:32, 23 July 2007
Line 3:		Line 3:
	ArmagetronAd SVN Repository:		ArmagetronAd SVN Repository:
	<pre>https://armagetronad.svn.sourceforge.net/svnroot/armagetronad</pre>		<pre>https://armagetronad.svn.sourceforge.net/svnroot/armagetronad</pre>
	This repository contains the main armagetronad module. Click [~~http~~://svn.sourceforge.net/armagetronad here] to browse the repository with your browser.		This repository contains the main armagetronad module. Click [https://armagetronad.svn.sourceforge.net/svnroot/armagetronad here] to browse the repository with your browser.

	This page propbably can't replace reading the [http://svnbook.red-bean.com/ Subversion Book], but it should get you started.		This page propbably can't replace reading the [http://svnbook.red-bean.com/ Subversion Book], but it should get you started.

Lucifer: Updated svn url

2007-07-23T07:13:26Z

Updated svn url

← Older revision		Revision as of 03:13, 23 July 2007
Line 2:		Line 2:

	ArmagetronAd SVN Repository:		ArmagetronAd SVN Repository:
	<pre>https://svn.sourceforge.net/svnroot/armagetronad</pre>		<pre>https://armagetronad.svn.sourceforge.net/svnroot/armagetronad</pre>
	This repository contains the main armagetronad module. Click [http://svn.sourceforge.net/armagetronad here] to browse the repository with your browser.		This repository contains the main armagetronad module. Click [http://svn.sourceforge.net/armagetronad here] to browse the repository with your browser.

Joda: clarified repository location for eclipse

2006-08-26T20:29:54Z

clarified repository location for eclipse

← Older revision		Revision as of 16:29, 26 August 2006
Line 1:		Line 1:
	Don't you worry, working with subversion is, for everyday operation, just the same as working with CVS. In fact, rule 1 is that command line users get by pretty well by just replacing the cvs command with svn. Once you have a checkout that is.		Don't you worry, working with subversion is, for everyday operation, just the same as working with CVS. In fact, rule 1 is that command line users get by pretty well by just replacing the cvs command with svn. Once you have a checkout that is.

			ArmagetronAd SVN Repository:
			<pre>https://svn.sourceforge.net/svnroot/armagetronad</pre>
			This repository contains the main armagetronad module. Click [http://svn.sourceforge.net/armagetronad here] to browse the repository with your browser.

	This page propbably can't replace reading the [http://svnbook.red-bean.com/ Subversion Book], but it should get you started.		This page propbably can't replace reading the [http://svnbook.red-bean.com/ Subversion Book], but it should get you started.

Wrtlprnft: /* Merging */ oops

2006-07-28T22:36:04Z

Merging: oops

← Older revision		Revision as of 18:36, 28 July 2006
Line 110:		Line 110:
	Merging one branch to another is done by checking out the branch that will be the target of the merge first. You need to know the revision number the branch that's supposed to be merged was created or merged the last time first, find it out via <code>svn log</code> or CIA. Then you need to execute the following command:		Merging one branch to another is done by checking out the branch that will be the target of the merge first. You need to know the revision number the branch that's supposed to be merged was created or merged the last time first, find it out via <code>svn log</code> or CIA. Then you need to execute the following command:

	svn merge -r <last merged revision number>:HEAD https://svn.sourceforge.net/svnroot/armagetronad/path/to/the/branch		svn merge -r <last merged revision number>:HEAD https://svn.sourceforge.net/svnroot/armagetronad/path/to/the/branch <local path of the checkout>

	This will merge the changes into the working copy of the target branch, you have to resolve conflicts if they exist and then you can commit the branch. You can use the output of <code>svn log -r <revisionlastmerged>:~~HEAD~~ HEAD https://svn.sourceforge.net/svnroot/armagetronad/path/to/the/branch</code> as part of the commit message.		This will merge the changes into the working copy of the target branch, you have to resolve conflicts if they exist and then you can commit the branch. You can use the output of <code>svn log -r <revisionlastmerged>:HEAD https://svn.sourceforge.net/svnroot/armagetronad/path/to/the/branch</code> as part of the commit message.

	=== Private space (proposal) ===		=== Private space (proposal) ===

Wrtlprnft: Fixed headings and added info about merging branches. I hope this is the Right Way (TM) to do it.

2006-07-28T22:33:21Z

Fixed headings and added info about merging branches. I hope this is the Right Way (TM) to do it.

← Older revision		Revision as of 18:33, 28 July 2006
Line 3:		Line 3:
	This page propbably can't replace reading the [http://svnbook.red-bean.com/ Subversion Book], but it should get you started.		This page propbably can't replace reading the [http://svnbook.red-bean.com/ Subversion Book], but it should get you started.

	= Commands =		== Commands ==

	Most of this requires that you have a working copy checked out; see below how to get one.		Most of this requires that you have a working copy checked out; see below how to get one.

	== For Windows Users ==		=== For Windows Users ===

	Use [http://tortoisesvn.tigris.org/ TortoiseSVN]. When any documentation says "do svn <command>", look for the command in your right-click context menu.		Use [http://tortoisesvn.tigris.org/ TortoiseSVN]. When any documentation says "do svn <command>", look for the command in your right-click context menu.
	SVN properties (commands: "svn propget/propset/propedit") aren't in the Tortoise submenu, they're hidden in the generic "Properties" menu item at the bottom.		SVN properties (commands: "svn propget/propset/propedit") aren't in the Tortoise submenu, they're hidden in the generic "Properties" menu item at the bottom.

	== For Former CVS Users ==		=== For Former CVS Users ===

	"cvs update" becomes "svn update". It accepts a -r argument to fetch a specific revision just like in CVS. Note that in SVN, revisions are global.		"cvs update" becomes "svn update". It accepts a -r argument to fetch a specific revision just like in CVS. Note that in SVN, revisions are global.
Line 26:		Line 26:
	In CVS, you would switch a checkout from the trunk to a branch, conserving your local changes, with "cvs update -r b0_2_8". In SVN, assuming you have the whole project checked out, you do <pre>svn switch https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.2.8</pre>		In CVS, you would switch a checkout from the trunk to a branch, conserving your local changes, with "cvs update -r b0_2_8". In SVN, assuming you have the whole project checked out, you do <pre>svn switch https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.2.8</pre>

	== For New Users ==		=== For New Users ===

	(only covering the basics here)		(only covering the basics here)
Line 42:		Line 42:
	When it is time to publish your work, do "svn status" to see which files you touched. If you know you only worked on a single task since your last commit and none of the changed files indicated by "svn status" look strange, simply do "svn commit", and enter an appropriate commit message describing your change either in the editor that pops up or via the "-m <message>" command line switch. If you did several things, do for every thing "svn commit <list of files of thing>", again with an appropriate commit message. If you can't remember what you did or if you want to check, do "svn diff <list of files to check>". Windows users have it easier here, they just commit and get a nice dialog where they can select the files to commit, and a doubleclick gives them the diff.		When it is time to publish your work, do "svn status" to see which files you touched. If you know you only worked on a single task since your last commit and none of the changed files indicated by "svn status" look strange, simply do "svn commit", and enter an appropriate commit message describing your change either in the editor that pops up or via the "-m <message>" command line switch. If you did several things, do for every thing "svn commit <list of files of thing>", again with an appropriate commit message. If you can't remember what you did or if you want to check, do "svn diff <list of files to check>". Windows users have it easier here, they just commit and get a nice dialog where they can select the files to commit, and a doubleclick gives them the diff.

	= Checkouts =		== Checkouts ==

	The basic command to get a checkout is		The basic command to get a checkout is
Line 49:		Line 49:
	Where <path> is a yet to be specified subpath in our repository (you usually don't fetch the whole thing) and <target> is the name of the directory where the checkout will reside in. In SVN, branches and tags are managed simply as different paths in the repository. So your choice of <path> determines which branch or which tag and which module you're getting.		Where <path> is a yet to be specified subpath in our repository (you usually don't fetch the whole thing) and <target> is the name of the directory where the checkout will reside in. In SVN, branches and tags are managed simply as different paths in the repository. So your choice of <path> determines which branch or which tag and which module you're getting.

	== Layout ==		=== Layout ===

	Subject to change with notice, <path> is organized like this for core modules:		Subject to change with notice, <path> is organized like this for core modules:
Line 77:		Line 77:
	Selecting branches is still cumbersome that way. That's why we're pondering to introduce		Selecting branches is still cumbersome that way. That's why we're pondering to introduce

	== Workspaces (proposal) ==		=== Workspaces (proposal) ===

	Workspaces are parts of the repository that use a special subversion feature called externals to give you the checkouts you need for a specific task. You'll be able to get your workspace with		Workspaces are parts of the repository that use a special subversion feature called externals to give you the checkouts you need for a specific task. You'll be able to get your workspace with
Line 106:		Line 106:
	Test workspaces have been committed in the original armagetron SVN repository. Get them as described above, replacing "armagetronad" with "armagetron". The two workspace names are "gas" and "liquid", pointing to the trunk and 0.2.8, respectively.		Test workspaces have been committed in the original armagetron SVN repository. Get them as described above, replacing "armagetronad" with "armagetron". The two workspace names are "gas" and "liquid", pointing to the trunk and 0.2.8, respectively.

	== Private space (proposal) ==		=== Merging ===

			Merging one branch to another is done by checking out the branch that will be the target of the merge first. You need to know the revision number the branch that's supposed to be merged was created or merged the last time first, find it out via <code>svn log</code> or CIA. Then you need to execute the following command:

			svn merge -r <last merged revision number>:HEAD https://svn.sourceforge.net/svnroot/armagetronad/path/to/the/branch

			This will merge the changes into the working copy of the target branch, you have to resolve conflicts if they exist and then you can commit the branch. You can use the output of <code>svn log -r <revisionlastmerged>:HEAD HEAD https://svn.sourceforge.net/svnroot/armagetronad/path/to/the/branch</code> as part of the commit message.

			=== Private space (proposal) ===

	We'll have a section in the repository reserved for private use; personalized copies of workspaces can go there, or branches where only one or two developers work on. The sub-category path would be "private/<user name>".		We'll have a section in the repository reserved for private use; personalized copies of workspaces can go there, or branches where only one or two developers work on. The sub-category path would be "private/<user name>".
Line 114:		Line 122:
	At some point, private branches in the repository may be available to non-developers on request.		At some point, private branches in the repository may be available to non-developers on request.

	= Caveats =		== Caveats ==

	Your commits don't appear in "svn log" until you do "svn update". This is important for alpha builds. Always update before you make an alpha, or the ChangeLog will not reflect your latest changes, and the revision that the alpha will carry (later publicily in the version, for now as a fingerprint file) will be wrong.		Your commits don't appear in "svn log" until you do "svn update". This is important for alpha builds. Always update before you make an alpha, or the ChangeLog will not reflect your latest changes, and the revision that the alpha will carry (later publicily in the version, for now as a fingerprint file) will be wrong.

Z-man: /* For Windows Users */

2006-06-04T07:52:15Z

For Windows Users

← Older revision		Revision as of 03:52, 4 June 2006
Line 9:		Line 9:
	== For Windows Users ==		== For Windows Users ==

	Use [http://~~www~~.~~tortoisecvs~~.org/ ~~TortoiseCVS~~]. When any documentation says "do svn <command>", look for the command in your right-click context menu.		Use [http://tortoisesvn.tigris.org/ TortoiseSVN]. When any documentation says "do svn <command>", look for the command in your right-click context menu.
	SVN properties (commands: "svn propget/propset/propedit") aren't in the Tortoise submenu, they're hidden in the generic "Properties" menu item at the bottom.		SVN properties (commands: "svn propget/propset/propedit") aren't in the Tortoise submenu, they're hidden in the generic "Properties" menu item at the bottom.

Z-man-work: /* Workspaces (proposal) */

2006-05-31T09:12:28Z

Workspaces (proposal)

← Older revision		Revision as of 05:12, 31 May 2006
Line 89:		Line 89:
	<branch> is a symbolic branch name. We won't be making workspaces for every branch, only for those actually in use. <branch> can be one of "trunk" for the trunk, "bugfix" for the branch leading to the very next release, and "stable" for the branch leading to one of the releases after that one.		<branch> is a symbolic branch name. We won't be making workspaces for every branch, only for those actually in use. <branch> can be one of "trunk" for the trunk, "bugfix" for the branch leading to the very next release, and "stable" for the branch leading to one of the releases after that one.

	We'll be updating the workspaces to always point to the branches that meet the description. "trunk" will always be the trunk. Right now, "stable" would point to 0.2.8, and "bugfix" to 0.2.8.2, but that one is still managed in CVS, so "bugfix" will point to 0.2.8 as well. Changes ~~into the "future", for example pointing "bugfix"~~ to ~~a newly creates 0.2.8.3 branch, will be done without big announcements; your checkout of~~ the ~~workspace will make the update automatically, taking with it all uncommitted changes as if it was a regular update. Changes that mess with the module structure~~ will be announced; ~~with those,~~ uncommitted changes ~~may~~ get lost.		We'll be updating the workspaces to always point to the branches that meet the description. "trunk" will always be the trunk. Right now, "stable" would point to 0.2.8, and "bugfix" to 0.2.8.2, but that one is still managed in CVS, so "bugfix" will point to 0.2.8 as well. Changes to the structore will be announced; uncommitted changes to externals get lost silently if the repository path gets updated.

	There are simple rules which change should be done in which of the workspaces:		There are simple rules which change should be done in which of the workspaces:
Line 102:		Line 102:
	* long/mid/short (for longterm, midterm and shortterm quality focus)		* long/mid/short (for longterm, midterm and shortterm quality focus)
	* gas/liquid/solid (states of matter representing the stability, easily extended to "plasma" for experimental stuff)		* gas/liquid/solid (states of matter representing the stability, easily extended to "plasma" for experimental stuff)
	* alpha/beta/gamma		* alpha/beta/gamma (the classics, extended to gamma for release candidate quality)

			Test workspaces have been committed in the original armagetron SVN repository. Get them as described above, replacing "armagetronad" with "armagetron". The two workspace names are "gas" and "liquid", pointing to the trunk and 0.2.8, respectively.

	== Private space (proposal) ==		== Private space (proposal) ==

Z-man-work: /* Layout */

2006-05-31T09:05:40Z

Layout

← Older revision		Revision as of 05:05, 31 May 2006
Line 68:		Line 68:
	To get the same for one of the earlier branches, you do		To get the same for one of the earlier branches, you do
	<pre>svn co https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.2.8/armagetronad armagetronad		<pre>svn co https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.2.8/armagetronad armagetronad
	~~svn co~~ svn co https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.2.8/build build</pre>		svn co https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.2.8/build build</pre>

	Sounds complicated and cumbersome for many modules? Just check out everything from the trunk with		Sounds complicated and cumbersome for many modules? Just check out everything from the trunk with

Z-man-work: /* Workspaces (proposal) */

2006-05-31T08:55:01Z

Workspaces (proposal)

← Older revision		Revision as of 04:55, 31 May 2006
Line 102:		Line 102:
	* long/mid/short (for longterm, midterm and shortterm quality focus)		* long/mid/short (for longterm, midterm and shortterm quality focus)
	* gas/liquid/solid (states of matter representing the stability, easily extended to "plasma" for experimental stuff)		* gas/liquid/solid (states of matter representing the stability, easily extended to "plasma" for experimental stuff)
			* alpha/beta/gamma

	== Private space (proposal) ==		== Private space (proposal) ==