I've a "problem" with svn I can't understand why sometimes when I merge two branches it reports modify on mergeinfo property on files with no changes on the text.
Is it a normal behavior?
If not, what can be the problem?
Well, you did merge those two branches. Right? Works as expected.
What you did was do a merge. Even though the merge didn't result in any code changes, and that's not uncommon with merges, Subversion still marks that a merge was done. If nothing else, marking that you did a merge -- even though it resulted in no changes, is still a good idea. Imagine a release going out, and someone saying "Wait, no one merged that branch back into the trunk! We'll have to delay the release until we get that done" because they didn't see the merge in the
So, yes what you saw can be normal behavior.
Now, if your question is "Why didn't my changes get merged", that's a different issue. Subversion usually does a good job with merges, but you have to make sure you do a few things:
svn:merge-infoall over the place.
--reintegrateflag. You have a branch "A" (which could include trunk in this example). You make a branch "B" from branch "A".
--reintegrate. It changes the way Subversion handled the merge.
svn merge --record-only, so that Subversion knows you've done the merge. Hilarity ensues when developers do some merges manually while others allow Subversion to do the merge.
So, if Subversion didn't merge in changes it should have, make sure that you're using the
--reintegrate correctly, and that you're not having the other issues mentioned above.
svn:mergeinfo property is used to track information about merges which have been performed in your repository.
See the SVNBook for details: "Mergeinfo and Previews".