close
Warning:
Can't synchronize with repository "(default)" (/var/svn/tolp does not appear to be a Subversion repository.). Look in the Trac log for more information.
- Timestamp:
-
Feb 26, 2009, 8:59:07 AM (17 years ago)
- Author:
-
Víctor de Buen Remiro
- Comment:
-
--
Legend:
- Unmodified
- Added
- Removed
- Modified
-
|
v5
|
v6
|
|
| 29 | 29 | |
| 30 | 30 | === Starting === |
| 31 | | |
| | 31 | ... |
| 32 | 32 | |
| 33 | 33 | === Creating a branch === |
| … |
… |
|
| 51 | 51 | |
| 52 | 52 | === Recovering a trying branch to trunk === |
| 53 | | |
| 54 | | 1. Move to the tolp root of your local copy |
| 55 | | 1. Update remote changes in both trunk and trying branch |
| 56 | | 1. Comit all local changes in both trunk and trying branch |
| 57 | | 1. Merge changes from in both trying branch to trunk |
| 58 | | {{{ |
| 59 | | svn merge https://www.tol-project.org/svn/tolp/branches/my_trying_branch https://www.tol-project.org/svn/tolp/trunk trunk |
| 60 | | }}} |
| 61 | | 1. If there is a conflict you will be asked in order to select one of two versions or pospone the decision. So you must monitorice the console from time to time. |
| 62 | | 1. If there new or deleted files in the branch you must add or remove them manually. |
| 63 | | 1. When there is no pendent conflict commit all changes |
| 64 | | |
| | 53 | ... |
