problem with merging branch to trunk?

Just now I tried to merge my branch to the trunk with the following handlings:

1. Update the working copy of the trunk
2. Merge->reintegrate

Then the folder of the working copy of the trunk gets the conflicting sign. By means of Check for modifications I get a list which contains a lot files and even the folder of the trunk copy. Beside the list a window with the title "svn_mergeinfo-TortoiseMerge" appears. 开发者_如何学运维This window displays two panels, svn:mergeinfo:Working Base and svn:mergeinfo: Working Copy. In the Working Copy panel there is a file with some numbers, perhaps versions, aheaded with a plus sign. Its counterpart in the Working Base panel is gray blank. Most of them have been found not modified at all.

What are the wrongings I have done? How could I get rid of the issue?

Thanks a lot in advance.

John

The svn:mergeinfo property is set so Subversion can help you track which revisions have been merged into the trunk or a particular branch. This is normal, and harmless, as it does not affect file contents. For instance, TortoiseSVN uses this to gray out revisions that have already been merged in the GUI for convenience.

Check out this link for more information => svn:mergeinfo

Seems that changes in trunk and branch can not be merged automatically. (Did somebody or you modify trunk after branch has been made?) Suppose, you need to merge it manually, with the help of mdiff tool for example.