when merging from branch, the directory that I didn't create is shown

Question

I'm working on IntelliJ on window7. merging from the branch on my trunk with 7 files. but like below image, 7 files and 1 directory are displayed on changes. this directory, I didn't create.

I think this directory isn't physical directory, it's just meta data file. do you explain this situation and it directory's meaning?

thanks.

enter image description here

Did my answer help you in 2013? Please, upvote it then. :) – bahrep Feb 15 '19 at 14:35 — bahrep, Feb 15 '19 at 14:35

score 0 · Accepted Answer · answered Dec 10 '13 at 09:52

It looks like a property-only change to the directory. It adds svn:mergeinfo property as a merge result.

SVNBook | Merge and previews:

The svn:mergeinfo property is automatically maintained by Subversion whenever you run svn merge. Its value indicates which changes made to a given path have been replicated into the directory in question.

when merging from branch, the directory that I didn't create is shown

1 Answers1