Clever Geek Handbook

Selective merger in subversion

Does anyone know how to avoid merging specific files in branch merge? For example, if I am merging things from mybranch to trunk, but if I do NOT want to try to merge certain files, is there a way to set something to be ignored by looking at those files?

The files I need to ignore may or may not share file extensions. This scenario is important for stiautions where I want to handle certain files manually, sicne. I'm sure they are in conflict. The conflict will prevent the continuation of the merge on the leftover files - they are large in number, and I would like them to be merged automatically when I encounter conflicting files.

Thanks in advance!

(I looked at other related queries here on SO but couldn't find one that matches the situation I have)

EDIT: Is there a way to avoid looking at certain files - instead of sitting in my merge workspace in conflict with conflicting state and thus preventing recursive commits to other files.

+2


source to share


2 answers


I don't think there is a direct way to accomplish what you want.

Depending on whether the "merge list" is longer or shorter than the "non-merge list", I would try one of these two approaches:



  • Make the merge explicitly listing all the files you want to merge.

  • Do a full merge, resolve conflicts, then "svn revert" any files you don't want to merge. You should end up with a working copy with many combined files and a few unharmed.

Just a suggestion.

+2


source


There is an option to allow SVN to continue merging even if conflicts arise and to resolve them later.



Edit: you can mark these files as "already merged". This will change the properties so that SVN assumes they have already been merged and do not let them merge those fixes again. However, it will be much more difficult to combine them later.

0


source






More articles:


All Articles