How to enable svn merge to consider externals for changes?

2
votes

Suppose a checkout from an svn-automatically copied svn:externals file, ie /granddad/folderExternaled/myComputedFile.txt. This checkout is from an old branch, so its externals are not the same as in the trunk. Then I merge from trunk to branch.

The result is, in SVN 1.6.* ;

  1. /granddad/folderExternaled/ has its externals not changed, but its mergenfo is.
  2. /granddad/folderExternaled/myComputedFile.txt has its mergeinfo changed, so it registers as a CONFLICT.

The result is, in TortoiseSVN 1.7.4.22459, only item 1; Item 2 is correctly unchanged with no conflicts.

I wish, in TortoiseSVN preferably but in SVN if not, that I could have a "checkbox"/option to ignore or consider the externals folders, which are apparently they are partly ignored (no functional change accepted) and partly considered (mergeinfo is updated).

Update:

I might not have been clear on my question.

I'd like to figure out a workaround and I wasn't sure if anything was available. Maybe nothing is since I got no replies. Or maybe I wasn't clear enough. It's the last paragraph, just above this that states the problem.

1
svnmergetortoisesvn

1 Answers

1
votes

Externals should never have considered modifications because it is not a good practice to change them, even if they are part of repositories that you can modify, and also even if interests to the user to know which modifications will be applied with the merge. This is why the behavior of version 1.7 makes more sense: only the property entries from the repository should be monitored by SVN, not inserting mergeinfo in Externals folders.

If you really need to check these modifications, I recommend you to Checkout the two versions from your Externals and compare them overwriting manually the oldest files with the newest files.