Difference between revisions of "Final Merge From Development Area"

From NST Wiki
Jump to navigationJump to search
(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...")
 
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.

Revision as of 09:35, 12 April 2013

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@dev18-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev 
Path: .
Working Copy Root Path: /root/dev
URL: https://svn.code.sf.net/p/nst/code/dev
Repository Root: https://svn.code.sf.net/p/nst/code
Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
Revision: 4481
Node Kind: directory
Schedule: normal
Last Changed Author: pblankenbaker
Last Changed Rev: 4481
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
Path: repo
URL: https://svn.code.sf.net/p/nst/code/repo
Repository Root: https://svn.code.sf.net/p/nst/code
Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c
Revision: 4498
Node Kind: directory
Last Changed Author: pblankenbaker
Last Changed Rev: 4455
Last Changed Date: 2013-04-08 07:42:43 -0400 (Fri, 12 Apr 2013)

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