Final Merge From Development Area - Revision history

Paul Blankenbaker: Updated for 36

2022-07-10T15:39:59Z

Updated for 36

← Older revision		Revision as of 11:39, 10 July 2022
Line 14:		Line 14:

	USERID=YOUR_USERID		USERID=YOUR_USERID
	svn cp svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/dev/32 svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/repo/32		svn cp svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/dev/36 svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/repo/36

	Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.		Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.

	[nst@nst-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/dev/32		[nst@nst-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/dev/36
	Path: 32		Path: 36
	URL: https://svn.code.sf.net/p/nst/code/dev/32		URL: https://svn.code.sf.net/p/nst/code/dev/36
	Relative URL: ^/dev/32		Relative URL: ^/dev/36
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
Line 30:		Line 30:
	Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)		Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)

	[nst@~~nst32~~-repo livecd]$ svn info https://svn.code.sf.net/p/nst/code/repo/32		[nst@nst36-repo livecd]$ svn info https://svn.code.sf.net/p/nst/code/repo/36
	Path: 32		Path: 36
	URL: https://svn.code.sf.net/p/nst/code/repo/32		URL: https://svn.code.sf.net/p/nst/code/repo/36
	Relative URL: ^/repo/32		Relative URL: ^/repo/36
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c

Paul Blankenbaker at 11:36, 7 June 2020

2020-06-07T11:36:46Z

← Older revision		Revision as of 07:36, 7 June 2020
Line 29:		Line 29:
	Last Changed Rev: 11990		Last Changed Rev: 11990
	Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)		Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)

			[nst@nst32-repo livecd]$ svn info https://svn.code.sf.net/p/nst/code/repo/32
			Path: 32
			URL: https://svn.code.sf.net/p/nst/code/repo/32
			Relative URL: ^/repo/32
			Repository Root: https://svn.code.sf.net/p/nst/code
			Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
			Revision: 11991
			Node Kind: directory
			Last Changed Author: pblankenbaker
			Last Changed Rev: 11991
			Last Changed Date: 2020-06-07 07:29:36 -0400 (Sun, 07 Jun 2020)

	[nst@nst-repo dev]$		[nst@nst-repo dev]$

	In the output above, we see that the ''dev'' area is at revision ''11991'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''11991'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.		In the output above, we see that the ''dev'' area is at revision ''11991'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''11991'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.

Paul Blankenbaker: Updated for NST 32 release

2020-06-07T11:33:35Z

Updated for NST 32 release

← Older revision		Revision as of 07:33, 7 June 2020
Line 3:		Line 3:
	To verify that your ''dev'' area is up to date and committed:		To verify that your ''dev'' area is up to date and committed:

	[nst@~~nst24~~-repo dev]$ svn update		[nst@nst-repo dev]$ svn update
	Updating '.':		Updating '.':
	At revision ~~10230~~.		At revision 11990.
	[nst@~~nst24~~-repo dev]$ svn commit		[nst@nst-repo dev]$ svn commit
	[nst@~~nst24~~-repo dev]$ svn status -u		[nst@nst-repo dev]$ svn status -u
	Status against revision: ~~10230~~		Status against revision: 11990
	[nst@~~nst24~~-repo dev]$		[nst@nst-repo dev]$

	If you have not created the ''repo'' area yet for release, do so now with an ''svn cp'' command similar to the following (replace USERID with your SourceForge login):		If you have not created the ''repo'' area yet for release, do so now with an ''svn cp'' command similar to the following (replace USERID with your SourceForge login):

	svn cp svn+ssh://USERID@svn.code.sf.net/p/nst/code/dev/28 svn+ssh://USERID@svn.code.sf.net/p/nst/code/repo/28		USERID=YOUR_USERID
			svn cp svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/dev/32 svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/repo/32

	Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.		Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.

	[nst@~~nst24~~-repo dev]$ svn info ~~https://nst.svn.sourceforge.net/svnroot/nst/dev/24~~		[nst@nst-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/dev/32
	~~Redirecting to URL '~~https://svn.code.sf.net/p/nst/code/dev/~~24':~~		Path: 32
	Path: 24		URL: https://svn.code.sf.net/p/nst/code/dev/32
	URL: https://svn.code.sf.net/p/nst/code/dev/24		Relative URL: ^/dev/32
	Relative URL: ^/dev/24
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
	Revision: ~~7967~~		Revision: 11991
	Node Kind: directory		Node Kind: directory
	Last Changed Author: pblankenbaker		Last Changed Author: pblankenbaker
	Last Changed Rev: ~~7966~~		Last Changed Rev: 11990
	Last Changed Date: ~~2016~~-07~~-02 14~~:17~~:19~~ -0400 (~~Sat~~, ~~02 Jul 2016~~)		Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)

	[nst@~~nst24-repo dev]$ svn info https://svn.code.sf.net/p/~~nst~~/code/repo/24~~		[nst@nst-repo dev]$
	~~Path: 24~~
	~~URL: https://svn.code.sf.net/p/nst/code/repo/24~~
	~~Relative URL: ^/repo/24~~
	~~Repository Root: https://svn.code.sf.net/p/nst/code~~
	~~Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c~~
	~~Revision: 7967~~
	~~Node Kind: directory~~
	~~Last Changed Author: pblankenbaker~~
	~~Last Changed Rev: 7967~~
	~~Last Changed Date: 2016-07-02 14:18:41 -0400 (Sat, 02 Jul 2016)~~

	~~[nst@nst24~~-repo dev]$

	In the output above, we see that the ''dev'' area is at revision ''~~7967~~'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''~~7967~~'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.		In the output above, we see that the ''dev'' area is at revision ''11991'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''11991'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.

Paul Blankenbaker at 13:41, 30 June 2018

2018-06-30T13:41:19Z

← Older revision		Revision as of 09:41, 30 June 2018
Line 8:		Line 8:
	[nst@nst24-repo dev]$ svn commit		[nst@nst24-repo dev]$ svn commit
	[nst@nst24-repo dev]$ svn status -u		[nst@nst24-repo dev]$ svn status -u
	Status against revision: ~~7967~~		Status against revision: 10230
	[nst@nst24-repo dev]$		[nst@nst24-repo dev]$

Paul Blankenbaker at 13:40, 30 June 2018

2018-06-30T13:40:51Z

← Older revision		Revision as of 09:40, 30 June 2018
Line 3:		Line 3:
	To verify that your ''dev'' area is up to date and committed:		To verify that your ''dev'' area is up to date and committed:

			[nst@nst24-repo dev]$ svn update
			Updating '.':
			At revision 10230.
			[nst@nst24-repo dev]$ svn commit
	[nst@nst24-repo dev]$ svn status -u		[nst@nst24-repo dev]$ svn status -u
	Status against revision: 7967		Status against revision: 7967
	[nst@nst24-repo dev]$		[nst@nst24-repo dev]$

			If you have not created the ''repo'' area yet for release, do so now with an ''svn cp'' command similar to the following (replace USERID with your SourceForge login):

			svn cp svn+ssh://USERID@svn.code.sf.net/p/nst/code/dev/28 svn+ssh://USERID@svn.code.sf.net/p/nst/code/repo/28

	Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.		Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.

Paul Blankenbaker at 08:18, 6 October 2017

2017-10-06T08:18:22Z

← Older revision		Revision as of 04:18, 6 October 2017
Line 33:		Line 33:
	Last Changed Rev: 7967		Last Changed Rev: 7967
	Last Changed Date: 2016-07-02 14:18:41 -0400 (Sat, 02 Jul 2016)		Last Changed Date: 2016-07-02 14:18:41 -0400 (Sat, 02 Jul 2016)

	[nst@nst24-repo dev]$		[nst@nst24-repo dev]$

	In the output above, we see that the ''dev'' area is at revision ''7967'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''7967'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.		In the output above, we see that the ''dev'' area is at revision ''7967'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''7967'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.

Paul Blankenbaker at 18:25, 2 July 2016

2016-07-02T18:25:51Z

← Older revision		Revision as of 14:25, 2 July 2016
Line 3:		Line 3:
	To verify that your ''dev'' area is up to date and committed:		To verify that your ''dev'' area is up to date and committed:

	[~~root~~@~~taco~~-~~dev32~~ dev]# svn status -u		[nst@nst24-repo dev]$ svn status -u
	Status against revision: ~~4481~~		Status against revision: 7967
	[~~root~~@~~taco~~-~~dev32~~ dev]#		[nst@nst24-repo dev]$

	Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.		Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.

	[~~root~~@~~dev22~~-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev/22		[nst@nst24-repo dev]$ svn info https://nst.svn.sourceforge.net/svnroot/nst/dev/24
	Redirecting to URL 'https://svn.code.sf.net/p/nst/code/dev/22':		Redirecting to URL 'https://svn.code.sf.net/p/nst/code/dev/24':
	Path: 22		Path: 24
	URL: https://svn.code.sf.net/p/nst/code/dev/22		URL: https://svn.code.sf.net/p/nst/code/dev/24
	Relative URL: ^/dev/22		Relative URL: ^/dev/24
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
	Revision: ~~7246~~		Revision: 7967
	Node Kind: directory		Node Kind: directory
	Last Changed Author: ~~rwhalb~~		Last Changed Author: pblankenbaker
	Last Changed Rev: ~~7245~~		Last Changed Rev: 7966
	Last Changed Date: ~~2015~~-10-02 06:26:33 -0400 (~~Fri~~, 02 ~~Oct 2015~~)		Last Changed Date: 2016-07-02 14:17:19 -0400 (Sat, 02 Jul 2016)

	[~~root~~@~~dev22~~-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo/22		[nst@nst24-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/repo/24
	~~Redirecting to URL 'https://svn.code.sf.net/p/nst/code/repo/22':~~		Path: 24
	Path: 22		URL: https://svn.code.sf.net/p/nst/code/repo/24
	URL: https://svn.code.sf.net/p/nst/code/repo/22		Relative URL: ^/repo/24
	Relative URL: ^/repo/22
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
	Revision: ~~7246~~		Revision: 7967
	Node Kind: directory		Node Kind: directory
	Last Changed Author: ~~rwhalb~~		Last Changed Author: pblankenbaker
	Last Changed Rev: ~~7246~~		Last Changed Rev: 7967
	Last Changed Date: ~~2015~~-10-02 06:29:29 -0400 (~~Fri~~, 02 ~~Oct 2015~~)		Last Changed Date: 2016-07-02 14:18:41 -0400 (Sat, 02 Jul 2016)

	[~~root~~@~~dev22~~-32 dev]#		[nst@nst24-repo dev]$

	In the output above, we see that the ''dev'' area is at revision ''~~7246~~'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''~~7246~~'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.		In the output above, we see that the ''dev'' area is at revision ''7967'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''7967'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.

Paul Blankenbaker at 11:08, 2 October 2015

2015-10-02T11:08:20Z

← Older revision		Revision as of 07:08, 2 October 2015
Line 9:		Line 9:
	Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.		Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.

	[root@~~dev18~~-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev		[root@dev22-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev/22
	~~Path~~: .		Redirecting to URL 'https://svn.code.sf.net/p/nst/code/dev/22':
	~~Working Copy Root~~ Path: ~~/root/dev~~		Path: 22
	URL: https://svn.code.sf.net/p/nst/code/dev		URL: https://svn.code.sf.net/p/nst/code/dev/22
			Relative URL: ^/dev/22
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
	Revision: ~~4481~~		Revision: 7246
	Node Kind: directory		Node Kind: directory
	~~Schedule: normal~~		Last Changed Author: rwhalb
	Last Changed Author: ~~pblankenbaker~~		Last Changed Rev: 7245
	Last Changed Rev: ~~4481~~		Last Changed Date: 2015-10-02 06:26:33 -0400 (Fri, 02 Oct 2015)
	Last Changed Date: ~~2013~~-04-~~09 14~~:22:44 -0400 (~~Tue~~, ~~09 Apr 2013~~)

	[root@~~dev18~~-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo		[root@dev22-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo/22
	Path: ~~repo~~		Redirecting to URL 'https://svn.code.sf.net/p/nst/code/repo/22':
	URL: https://svn.code.sf.net/p/nst/code/repo		Path: 22
			URL: https://svn.code.sf.net/p/nst/code/repo/22
			Relative URL: ^/repo/22
	Repository Root: https://svn.code.sf.net/p/nst/code		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
	Revision: ~~4498~~		Revision: 7246
	Node Kind: directory		Node Kind: directory
	Last Changed Author: ~~pblankenbaker~~		Last Changed Author: rwhalb
	Last Changed Rev: ~~4455~~		Last Changed Rev: 7246
	Last Changed Date: ~~2013~~-04-~~08 07~~:42:43 -0400 (Fri, ~~12 Apr 2013~~)		Last Changed Date: 2015-10-02 06:29:29 -0400 (Fri, 02 Oct 2015)

	[root@~~dev18~~-32 dev]#		[root@dev22-32 dev]#

	In the output above, we see that the ''dev'' area is at revision ''~~4481~~'' ~~whereas~~ the ''repo~~'' area is at revision ''4455~~''. ~~Since~~ the ''repo'' area ~~has a older~~ revision, a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.		In the output above, we see that the ''dev'' area is at revision ''7246'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''7246'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.

Paul Blankenbaker at 13:35, 12 April 2013

2013-04-12T13:35:38Z

← Older revision		Revision as of 09:35, 12 April 2013
Line 1:		Line 1:
	Before building a release, make sure that all of the updates to your development area have committed and merged into the ''~~trunk~~''.		Before building a release, make sure that all of the updates to your development area have committed and merged into the ''repo''.

	To verify that your ''dev'' area is up to date and committed:		To verify that your ''dev'' area is up to date and committed:

	[root@taco-dev32 dev]# svn status -u		[root@taco-dev32 dev]# svn status -u
	Status against revision: ~~4100~~		Status against revision: 4481
	[root@taco-dev32 dev]#		[root@taco-dev32 dev]#

	Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''~~trunk~~'' area is greater than or equal to the value in the ''dev'' area.		Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''repo'' area is greater than or equal to the value in the ''dev'' area.

	[root@~~taco~~-~~dev32~~ dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev		[root@dev18-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev
	Path: dev		Path: .
	URL: https://~~nst~~.~~svn~~.~~sourceforge~~.net/~~svnroot~~/nst/dev		Working Copy Root Path: /root/dev
	Repository Root: https://~~nst~~.~~svn~~.~~sourceforge~~.net/~~svnroot~~/nst		URL: https://svn.code.sf.net/p/nst/code/dev
	Repository UUID: ~~c9574408~~-~~7c70~~-~~44fe~~-~~bb37~~-~~9fe24d5f8586~~		Repository Root: https://svn.code.sf.net/p/nst/code
	Revision: ~~4100~~		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
			Revision: 4481
	Node Kind: directory		Node Kind: directory
	Last Changed Author: ~~rwhalb~~		Schedule: normal
	Last Changed Rev: ~~4100~~		Last Changed Author: pblankenbaker
	Last Changed Date: ~~2012~~-09~~-03 11~~:39:54 -0400 (~~Mon~~, ~~03 Sep 2012~~)		Last Changed Rev: 4481
			Last Changed Date: 2013-04-09 14:22:44 -0400 (Tue, 09 Apr 2013)

	[root@~~taco~~-~~dev32~~ dev]# svn info https://~~nst~~.~~svn~~.~~sourceforge~~.net/~~svnroot~~/nst/~~trunk~~		[root@dev18-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo
	Path: ~~trunk~~		Path: repo
	URL: https://~~nst~~.~~svn~~.~~sourceforge~~.net/~~svnroot~~/nst/~~trunk~~		URL: https://svn.code.sf.net/p/nst/code/repo
	Repository Root: https://~~nst~~.~~svn~~.~~sourceforge~~.net/~~svnroot~~/nst		Repository Root: https://svn.code.sf.net/p/nst/code
	Repository UUID: ~~c9574408~~-~~7c70~~-~~44fe~~-~~bb37~~-~~9fe24d5f8586~~		Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
	Revision: ~~4100~~		Revision: 4498
	Node Kind: directory		Node Kind: directory
	Last Changed Author: pblankenbaker		Last Changed Author: pblankenbaker
	Last Changed Rev: ~~4096~~		Last Changed Rev: 4455
	Last Changed Date: ~~2012~~-08-31 08:26:48 -0400 (Fri, ~~31 Aug 2012~~)		Last Changed Date: 2013-04-08 07:42:43 -0400 (Fri, 12 Apr 2013)

	[root@~~taco~~-~~dev32~~ dev]#		[root@dev18-32 dev]#

	In the output above, we see that the ''dev'' area is at revision ''~~4100~~'' whereas the ''~~trunk~~'' area is at revision ''~~4096~~''. Since the ''~~trunk~~'' area has a older revision, a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.		In the output above, we see that the ''dev'' area is at revision ''4481'' whereas the ''repo'' area is at revision ''4455''. Since the ''repo'' area has a older revision, a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.

Paul Blankenbaker: Created page with "Before building a release, make sure that all of the updates to your development area have committed and merged into the ''trunk''. To verify that your ''dev'' area is up to dat..."

2012-09-03T16:07:33Z

Created page with "Before building a release, make sure that all of the updates to your development area have committed and merged into the ''trunk''. To verify that your ''dev'' area is up to dat..."

New page

Before building a release, make sure that all of the updates to your development area have committed and merged into the ''trunk''.

To verify that your ''dev'' area is up to date and committed:

[root@taco-dev32 dev]# svn status -u
Status against revision: 4100
[root@taco-dev32 dev]#

Use the ''svn info'' command to verify that the ''Last Changed Rev'' value in the ''trunk'' area is greater than or equal to the value in the ''dev'' area.

[root@taco-dev32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev
Path: dev
URL: https://nst.svn.sourceforge.net/svnroot/nst/dev
Repository Root: https://nst.svn.sourceforge.net/svnroot/nst
Repository UUID: c9574408-7c70-44fe-bb37-9fe24d5f8586
Revision: 4100
Node Kind: directory
Last Changed Author: rwhalb
Last Changed Rev: 4100
Last Changed Date: 2012-09-03 11:39:54 -0400 (Mon, 03 Sep 2012)

[root@taco-dev32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/trunk
Path: trunk
URL: https://nst.svn.sourceforge.net/svnroot/nst/trunk
Repository Root: https://nst.svn.sourceforge.net/svnroot/nst
Repository UUID: c9574408-7c70-44fe-bb37-9fe24d5f8586
Revision: 4100
Node Kind: directory
Last Changed Author: pblankenbaker
Last Changed Rev: 4096
Last Changed Date: 2012-08-31 08:26:48 -0400 (Fri, 31 Aug 2012)

[root@taco-dev32 dev]#

In the output above, we see that the ''dev'' area is at revision ''4100'' whereas the ''trunk'' area is at revision ''4096''. Since the ''trunk'' area has a older revision, a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page.