Difference between revisions of "Final Merge From Development Area"
From NST Wiki
Jump to navigationJump to search| Line 9: | Line 9: | ||
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@ | + | [root@dev22-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev/22 |
| − | + | Redirecting to URL 'https://svn.code.sf.net/p/nst/code/dev/22': | |
| − | + | Path: 22 | |
| − | URL: https://svn.code.sf.net/p/nst/code/dev | + | URL: https://svn.code.sf.net/p/nst/code/dev/22 |
| + | Relative URL: ^/dev/22 | ||
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: 7246 |
Node Kind: directory | Node Kind: directory | ||
| − | + | Last Changed Author: rwhalb | |
| − | Last Changed Author: | + | Last Changed Rev: 7245 |
| − | Last Changed Rev: | + | Last Changed Date: 2015-10-02 06:26:33 -0400 (Fri, 02 Oct 2015) |
| − | Last Changed Date: | ||
| − | [root@ | + | [root@dev22-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo/22 |
| − | Path: | + | Redirecting to URL 'https://svn.code.sf.net/p/nst/code/repo/22': |
| − | URL: https://svn.code.sf.net/p/nst/code/repo | + | Path: 22 |
| + | URL: https://svn.code.sf.net/p/nst/code/repo/22 | ||
| + | Relative URL: ^/repo/22 | ||
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: 7246 |
Node Kind: directory | Node Kind: directory | ||
| − | Last Changed Author: | + | Last Changed Author: rwhalb |
| − | Last Changed Rev: | + | Last Changed Rev: 7246 |
| − | Last Changed Date: | + | Last Changed Date: 2015-10-02 06:29:29 -0400 (Fri, 02 Oct 2015) |
| − | [root@ | + | [root@dev22-32 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 ''7246'' as is the ''repo''. Had the ''repo'' area been at revision lower than ''7246'', a merge will be required. To perform the merge, follow the instructions found on the [[Subversion Notes]] page. |
Revision as of 07:08, 2 October 2015
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@dev22-32 dev]# svn info https://nst.svn.sourceforge.net/svnroot/nst/dev/22 Redirecting to URL 'https://svn.code.sf.net/p/nst/code/dev/22': Path: 22 URL: https://svn.code.sf.net/p/nst/code/dev/22 Relative URL: ^/dev/22 Repository Root: https://svn.code.sf.net/p/nst/code Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c Revision: 7246 Node Kind: directory Last Changed Author: rwhalb Last Changed Rev: 7245 Last Changed Date: 2015-10-02 06:26:33 -0400 (Fri, 02 Oct 2015) [root@dev22-32 dev]# svn info https://svn.code.sf.net/p/nst/code/repo/22 Redirecting to URL 'https://svn.code.sf.net/p/nst/code/repo/22': Path: 22 URL: https://svn.code.sf.net/p/nst/code/repo/22 Relative URL: ^/repo/22 Repository Root: https://svn.code.sf.net/p/nst/code Repository UUID: b5e161f0-cc72-4f2a-9017-da5bd5071a9c Revision: 7246 Node Kind: directory Last Changed Author: rwhalb Last Changed Rev: 7246 Last Changed Date: 2015-10-02 06:29:29 -0400 (Fri, 02 Oct 2015) [root@dev22-32 dev]#
In the output above, we see that the dev area is at revision 7246 as is the repo. Had the repo area been at revision lower than 7246, a merge will be required. To perform the merge, follow the instructions found on the Subversion Notes page.
