Final Merge From Development Area: Difference between revisions
From MediaWiki
Jump to navigationJump to search
No edit summary |
(Updated for 36) |
||
| (7 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: | ||
[ | [nst@nst-repo dev]$ svn update | ||
Status against revision: | 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/36 svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/repo/36 | |||
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@nst-repo dev]$ svn info https://svn.code.sf.net/p/nst/code/dev/36 | ||
Path: | Path: 36 | ||
URL: https://svn.code.sf.net/p/nst/code/dev/36 | |||
URL: https://svn.code.sf.net/p/nst/code/dev | Relative URL: ^/dev/36 | ||
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: | Revision: 11991 | ||
Node Kind: directory | Node Kind: directory | ||
Last Changed Author: pblankenbaker | Last Changed Author: pblankenbaker | ||
Last Changed Rev: | Last Changed Rev: 11990 | ||
Last Changed Date: | Last Changed Date: 2020-06-07 07:23:17 -0400 (Sun, 07 Jun 2020) | ||
[ | [nst@nst36-repo livecd]$ svn info https://svn.code.sf.net/p/nst/code/repo/36 | ||
Path: | Path: 36 | ||
URL: https://svn.code.sf.net/p/nst/code/repo | URL: https://svn.code.sf.net/p/nst/code/repo/36 | ||
Relative URL: ^/repo/36 | |||
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: | Revision: 11991 | ||
Node Kind: directory | Node Kind: directory | ||
Last Changed Author: pblankenbaker | Last Changed Author: pblankenbaker | ||
Last Changed Rev: | Last Changed Rev: 11991 | ||
Last Changed Date: | 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 '' | 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. | ||
Latest revision as of 10:39, 10 July 2022
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/36 svn+ssh://${USERID}@svn.code.sf.net/p/nst/code/repo/36
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/36 Path: 36 URL: https://svn.code.sf.net/p/nst/code/dev/36 Relative URL: ^/dev/36 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@nst36-repo livecd]$ svn info https://svn.code.sf.net/p/nst/code/repo/36 Path: 36 URL: https://svn.code.sf.net/p/nst/code/repo/36 Relative URL: ^/repo/36 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.
