Best way to have an SVN folder inside another SVN folder? Follow
So I have this type of setup
- Web Root
- Index.php
- /Images
- /Stuff
- /my_svn_library
- /More_stuff
Where Web Root is a respository on our SVN server located at /path/to/web_root
But my_svn_library is located somewhere else on the same SVN server /path/to/my_svn_library
What's the best way to tell PhpStorm what's going on here? When I have the PhpStorm project open at Web Root, it works most of the time. But sometimes it's confused about the files in my_svn_library. Right clicking it and selecting "resolve text conflict" seems to fix the issue. But I don't want to do this, and I don't know what it's doing anyways!
Please sign in to leave a comment.
It should work automatically, try setting up explicit mappings in Settings | Version Control. As WebStorm SVN integration uses metadata from .svn directory, it can handle multiple repositories under the same root out of the box.
Thanks! But I just tried doing SVN mappings in the settings and the problem still persists.
Here's what my project looks like. open_web and open_web_lib are at different svn folders in the repo. OpenWeb.php and xd_heper.html are definitely committed to open_web_lib. But they show up as not added.
I can right click on the file, go to SVN and "Add" is available, as if the file didn't exist in the SVN.
And I went into Version Control and setup these mappings. It didn't fix it.
After right clicking on open_web_lib and going to "Resolve Text Conflict" the issue goes away. But I have to do this every time I open up the project. And I have no idea what "Resolve Text Conflict" actually does.
Have you ever thought about creating svn:externals instead? In this case you don't need set create open_web_lib and checkout to it from that lib repo by hands on another PC.
Perfect Dmitriy. I should have been doing that all along.