The Issue
| Note |
|---|
The version restriction below is now/can be solved for all Deltares repositories. Each repository owner should send a request to the ICT department for an upgrades. Almost all issues below will then be solved. |
Deltares currently has an old SVN server that is <= 1.4. Therefore, some components of TortoiseSVN client >= 1.6 don't work. Especially merging with mergeinfo is not supported. SVN will show you the following error when trying to merge your branch back into the trunk:
...
Use the old merge option. To merge your branch back into the trunk use the old option 'Merge two different trees'.
Then set the following options in TortoiseSVN:
| No Format |
|---|
From:
URL: the trunk
Revision: The last revision that was merged into your branch. This can be the HEAD revision if your branch is completely up-to-date.
To:
URL: the branch you want to merge into the trunk
Head Revision
|
...