svntortoisesvnvisualsvnsvn-reintegrate

How to exclude specified files from SVN reintegrate branch?


I have 2 branches what I'm reintegrating

In both branches I have same CFG files what I dont want to be reconciled.
Wanted keep them versioned but not reconciled.

Do you know any way how to exclude specified files from this process?


Solution

  • Assuming the working copy (being merged) has no local modifications before the merge, can't you just revert those configuration files after the reintegration is done, but before you commit?

    Another option is if the changes to the configuration file(s) are committed separately from your other changes, then you could exclude those revisions from the merge. So instead of the branch re-integration option in TortoiseSVN, you could merge a range of revisions. More work for you though.