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, 5:16:12 PM (17 years ago)
- Author:
-
Jorge
- Comment:
-
--
Legend:
- Unmodified
- Added
- Removed
- Modified
-
|
v6
|
v7
|
|
| 50 | 50 | }}} |
| 51 | 51 | |
| 52 | | === Recovering a trying branch to trunk === |
| 53 | | ... |
| | 52 | === Merging changes === |
| | 53 | |
| | 54 | Located in working copy of a branch for instance tol_v_1_1_7 execute |
| | 55 | |
| | 56 | {{{ |
| | 57 | svn merge -r 660:HEAD https://www.tol-project.org/svn/tolp/trunk |
| | 58 | }}} |
| | 59 | |
| | 60 | this will merge in the working copy the changes in trunk since the revision 660 until the last revision. |