Subversion Notes - Revision history

Rwh: /* Checking Out Code */

2025-03-29T16:04:24Z

Checking Out Code

← Older revision		Revision as of 12:04, 29 March 2025
Line 76:		Line 76:
	== Checking Out Code ==		== Checking Out Code ==

	To make the initial checkout of the current source code into a sub-directory named ''nst'', you can use the following Subversion command:		Ex: 1 To make the initial checkout of the current source code into a sub-directory named ''nst'', you can use the following Subversion command:

	svn co ${SVNROOT}/trunk nst		svn co ${SVNROOT}/trunk nst

			Ex: 2 To make the initial checkout of the current development source code into a sub-directory named ''dev42'', you can use the following Subversion command:

			svn co ${SVNROOT}/dev/42 dev42

	== Committing Code ==		== Committing Code ==

Rwh: /* Switching User Repository Root */

2023-04-25T00:38:19Z

Switching User Repository Root

← Older revision		Revision as of 20:38, 24 April 2023
Line 434:		Line 434:
	== Switching User Repository Root ==		== Switching User Repository Root ==
	Use this subversion method to switch the "'''Repository Root'''" user from "'''USERID1'''" to "'''USERID2'''":		Use this subversion method to switch the "'''Repository Root'''" user from "'''USERID1'''" to "'''USERID2'''":
	svn relocate svn+ssh://USERID1@svn.code.sf.net/p/nst/code/dev/38 svn+ssh://USERID2@svn.code.sf.net/p/nst/code/dev/38		svn relocate svn+ssh://USERID1@svn.code.sf.net/p/nst/code/dev/38 svn+ssh://USERID2@svn.code.sf.net/p/nst/code/dev/38;

	= New NST Release Setup =		= New NST Release Setup =

Rwh: /* Relocate To A New Repository Root */

2023-04-25T00:37:58Z

Relocate To A New Repository Root

← Older revision		Revision as of 20:37, 24 April 2023
Line 431:		Line 431:
	[root@vortex dev]#		[root@vortex dev]#
	[root@vortex dev]# svn --username USERID relocate http://svn.code.sf.net/p/nst/code svn+ssh://USERID@svn.code.sf.net/p/nst/code;		[root@vortex dev]# svn --username USERID relocate http://svn.code.sf.net/p/nst/code svn+ssh://USERID@svn.code.sf.net/p/nst/code;

			== Switching User Repository Root ==
			Use this subversion method to switch the "'''Repository Root'''" user from "'''USERID1'''" to "'''USERID2'''":
			svn relocate svn+ssh://USERID1@svn.code.sf.net/p/nst/code/dev/38 svn+ssh://USERID2@svn.code.sf.net/p/nst/code/dev/38

	= New NST Release Setup =		= New NST Release Setup =

Rwh: /* Merging From Dev Area To The Repo Area */

2022-12-06T17:29:54Z

Merging From Dev Area To The Repo Area

← Older revision		Revision as of 13:29, 6 December 2022
Line 288:		Line 288:
	[root@dev20-64 repo]#		[root@dev20-64 repo]#

	Method for a svn user: '''svnuser''' setup: (Note: substitute the name '''user''' with your Subversion user name.		Method for a svn user: '''svnuser''' setup: (Note: substitute the name "'''user'''" with your Subversion user name.
	export SVNROOT="svn+ssh://user@svn.code.sf.net/p/nst/code";		export SVNROOT="svn+ssh://user@svn.code.sf.net/p/nst/code";
	alias svnuser='svn --username user';		alias svnuser='svn --username user';

Rwh: /* Merging From Dev Area To The Repo Area */

2022-12-06T17:29:21Z

Merging From Dev Area To The Repo Area

← Older revision		Revision as of 13:29, 6 December 2022
Line 287:		Line 287:
	... output from commit ...		... output from commit ...
	[root@dev20-64 repo]#		[root@dev20-64 repo]#

			Method for a svn user: '''svnuser''' setup: (Note: substitute the name '''user''' with your Subversion user name.
			export SVNROOT="svn+ssh://user@svn.code.sf.net/p/nst/code";
			alias svnuser='svn --username user';
			svnuser update; svnuser merge ${SVNROOT}/dev/36
			svnuser -m commit "Merging dev 36 area into repo 36 through r13374";


	This is the old method used for merging and updating the '''Trunk Area''' with code changes in the '''Development 18 Area''' spanning from revision: "''''4869'''" to the "'''HEAD (4877)'''" (latest changes committed to the ''dev/18'' area). Use the following link for NST code revision reference: http://nst.svn.sourceforge.net/viewvc/nst		This is the old method used for merging and updating the '''Trunk Area''' with code changes in the '''Development 18 Area''' spanning from revision: "''''4869'''" to the "'''HEAD (4877)'''" (latest changes committed to the ''dev/18'' area). Use the following link for NST code revision reference: http://nst.svn.sourceforge.net/viewvc/nst

Rwh: /* Preparing Development Machine */

2022-12-06T17:20:51Z

Preparing Development Machine

← Older revision		Revision as of 13:20, 6 December 2022
Line 14:		Line 14:

	export SVNROOT=https://nst.svn.sourceforge.net/svnroot/nst		export SVNROOT=https://nst.svn.sourceforge.net/svnroot/nst

			export SVNROOT=svn+ssh://user@svn.code.sf.net/p/nst/code

	After the ''SVNROOT'' variable is set, you should be able to run Subversion commands. For example the following shows the directories under ''SVNROOT''.		After the ''SVNROOT'' variable is set, you should be able to run Subversion commands. For example the following shows the directories under ''SVNROOT''.

Rwh: /* Directory Structure */

2020-04-10T15:47:03Z

Directory Structure

← Older revision		Revision as of 11:47, 10 April 2020
Line 36:		Line 36:
	= Directory Structure =		= Directory Structure =

	Currently the directory structure under Subversion is fairly straight forward. We use ''~~trunk~~'' as the current working area (this is what most developers will be checking out from and committing to). ~~When we have a release, we will copy ''trunk'' to~~ the ~~release number. For example~~, ~~to create~~ the ~~''2.13.0'' release, we would run the following Subversion command~~:		Currently the directory structure under Subversion is fairly straight forward. We use ''dev/FCVer'' (E.g., dev/30) as the current working area (this is what most developers will be checking out from and committing to). The following is the top level directory structure for Development (/dev), Release (/releases) and the pristine repository for pushing out package updates (/repo):

	svn ~~copy~~ ${SVNROOT}/~~trunk ${SVNROOT}~~/releases/~~2.13.0~~		[nst@vortex ~]$ svn ls ${SVNROOT}/
			dev/
			releases/
			repo/

	~~We would also run the following command for maintenance updates to the ''2.13.0'' release~~:		Under each top level directory there are Fedora specific source trees:

	svn ~~copy~~ ${SVNROOT}/~~trunk ${SVNROOT}~~/~~maintenance~~/2.13.0		[nst@vortex ~]$ svn ls ${SVNROOT}/dev
			18/
			2.11.0/
			2.12.0/
			2.13.0/
			2.15.0/
			2.16.0/
			20/
			21/
			22/
			24/
			26/
			28/
			30/
			32/

	= Subversion Commands =		= Subversion Commands =

Rwh: /* New NST Release Setup */

2020-04-10T15:35:09Z

New NST Release Setup

← Older revision		Revision as of 11:35, 10 April 2020
Line 410:		Line 410:
	Currently the directory structure under Subversion is fairly straight forward. As an example we use ''dev/30'' when working on Fedora 30 based builds. To move to Fedora 32 we do the following:		Currently the directory structure under Subversion is fairly straight forward. As an example we use ''dev/30'' when working on Fedora 30 based builds. To move to Fedora 32 we do the following:

	~~SVNROOT=svn+ssh://rwhalb@svn.code.sf.net/p/nst/code~~
	svn copy ${SVNROOT}/dev/30 ${SVNROOT}/dev/32;		svn copy ${SVNROOT}/dev/30 ${SVNROOT}/dev/32;

Rwh: /* Related Links */

2020-04-10T15:34:26Z

Paul Blankenbaker: Updated for the new svn relocate command

2019-07-03T10:18:49Z

Updated for the new svn relocate command

← Older revision		Revision as of 06:18, 3 July 2019
Line 386:		Line 386:
	[root@taco-dev32 repo]#		[root@taco-dev32 repo]#

	== ~~Switching~~ To A New ~~URL~~ ==		== Relocate To A New Repository Root ==
	This section demonstrates switching from one URL to another. In this example we switch from "'''http://svn.code.sf.net/p/nst/code~~/dev/26~~'''" to "'''svn+ssh://USERID@svn.code.sf.net/p/nst/code'''". The svn "'''~~switch~~'''" command ~~with option: "'''--relocate'''"~~ is used.
			This section demonstrates switching repository root from one URL to another. In this example we switch from "'''http://svn.code.sf.net/p/nst/code'''" to "'''svn+ssh://USERID@svn.code.sf.net/p/nst/code'''". The svn "'''relocate'''" command is used.

	[root@vortex dev]# svn info;		[root@vortex dev]# svn info;
Line 403:		Line 404:
	Last Changed Date: 2017-10-11 16:07:51 -0400 (Wed, 11 Oct 2017)		Last Changed Date: 2017-10-11 16:07:51 -0400 (Wed, 11 Oct 2017)
	[root@vortex dev]#		[root@vortex dev]#
	[root@vortex dev]# svn --username USERID ~~switch --~~relocate http://svn.code.sf.net/p/nst/code~~/dev/26~~ svn+ssh://USERID@svn.code.sf.net/p/nst/code~~/dev/26~~;		[root@vortex dev]# svn --username USERID relocate http://svn.code.sf.net/p/nst/code svn+ssh://USERID@svn.code.sf.net/p/nst/code;

	= Related Links =		= Related Links =

@@ Line 405: / Line 405: @@
   [root@vortex dev]#
   [root@vortex dev]# svn --username USERID relocate http://svn.code.sf.net/p/nst/code svn+ssh://USERID@svn.code.sf.net/p/nst/code;
 = Related Links =