Final Merge From Development Area

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:

[root@taco-dev32 dev]# svn status -u
Status against revision:   4481
[root@taco-dev32 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.

[root@dev22-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev/22 
Redirecting to URL 'https://svn.code.sf.net/p/nst/code/dev/22':
Path: 22
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 UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
Revision: 7246
Node Kind: directory
Last Changed Author: rwhalb
Last Changed Rev: 7245
Last Changed Date: 2015-10-02 06:26:33 -0400 (Fri, 02 Oct 2015)

[root@dev22-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo/22
Redirecting to URL 'https://svn.code.sf.net/p/nst/code/repo/22':
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 UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
Revision: 7246
Node Kind: directory
Last Changed Author: rwhalb
Last Changed Rev: 7246
Last Changed Date: 2015-10-02 06:29:29 -0400 (Fri, 02 Oct 2015)

[root@dev22-32 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.