Difference between revisions of "Final Merge From Development Area"

From NST Wiki
Jump to navigationJump to search
(6 intermediate revisions by the same user not shown)
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@nst-repo dev]$ svn update
  Status against revision:  4481
+
Updating '.':
  [root@taco-dev32 dev]#
+
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.
 
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  
+
  [nst@nst-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/dev/32
  Path: .
+
  Path: 32
Working Copy Root Path: /root/dev
+
  URL: https://svn.code.sf.net/p/nst/code/dev/32
  URL: https://svn.code.sf.net/p/nst/code/dev
+
Relative URL: ^/dev/32
 
  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: 11991
 
  Node Kind: directory
 
  Node Kind: directory
Schedule: normal
 
 
  Last Changed Author: pblankenbaker
 
  Last Changed Author: pblankenbaker
  Last Changed Rev: 4481
+
  Last Changed Rev: 11990
  Last Changed Date: 2013-04-09 14:22:44 -0400 (Tue, 09 Apr 2013)
+
  Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020)
 
   
 
   
  [root@dev18-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo
+
  [nst@nst32-repo livecd]$ svn info https://svn.code.sf.net/p/nst/code/repo/32
  Path: repo
+
  Path: 32
  URL: https://svn.code.sf.net/p/nst/code/repo
+
  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 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: 11991
 
  Node Kind: directory
 
  Node Kind: directory
 
  Last Changed Author: pblankenbaker
 
  Last Changed Author: pblankenbaker
  Last Changed Rev: 4455
+
  Last Changed Rev: 11991
  Last Changed Date: 2013-04-08 07:42:43 -0400 (Fri, 12 Apr 2013)
+
  Last Changed Date: 2020-06-07 07:29:36 -0400 (Sun, 07 Jun 2020)
 
   
 
   
  [root@dev18-32 dev]#
+
  [nst@nst-repo 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 ''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 07:36, 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@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]$

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.