Difference between revisions of "Final Merge From Development Area"

From NST Wiki
Jump to navigationJump to search
(Updated for NST 32 release)
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.

Revision as of 06:33, 7 June 2020

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:

[nst@nst-repo dev]$ svn update
Updating '.':
At revision 11990.
[nst@nst-repo dev]$ svn commit
[nst@nst-repo dev]$ svn status -u
Status against revision:   11990
[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):

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.

[nst@nst-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/dev/32
Path: 32
URL: https://svn.code.sf.net/p/nst/code/dev/32
Relative URL: ^/dev/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: 11990
Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)

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