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 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.