Documentation Wiki

Merging fixes using Tortoise SVN

Requirements

• Tortoise SVN (obviously)
• A clean checkout of the target branch

Procedure

From the root folder of the target branch (e.g. PostNuke-devel) select Merge from the tortoise SVN menu

In the resultant dialog box selected the URL and revision range of the changes that you wish to merge.

The from section is the first change that you wish to merge and to section is the last change. Any revisions between these two changes (within the provided URLs) will be merged into the target branch. By default tortoise SVN will only show revisions that have been made to branch since the last copy/merge operation.

Example 1 to merge a single revision #123456 from the PostNuke8? branch into the 'trunk' development branch
[insert picture]
Example 2 to merge a several revisions (#123456 - #123459) from the PostNuke8? branch into the 'trunk' development branch
[insert picture]

Select Dry run to check what files will be altered by this merge. Select Diff or unified diff to view or produce the exact changes that will be made to the target revision

Once happy that the merge will only make the intended chanages select merge. This will make the chanages to the clean target branch. After one last check to verify the changes commit the merged changes.