Good afternoon, dear experts. I’m forced to ask (for which I apologize in advance), because despite the documentation on svn and netbeans I can’t get into the basics.

If without Netbeans: There is a remote server with ftp and svn access. When I download a site via ftp I get one number of files, when through svn - another (less).

Question: Tell me, is this how it should be? If so, then what to do with them, combine them by replacing files? - apparently combine

Question: tell me how to combine files merged by ftp and from svn? - apparently perezalivat merged from svn over merged with ftp.

Now I generally work somehow crookedly, I have the same site separately on localhost, I change some file, then I merge the latest version into a local folder with svn, then I compare them via notepad ++ or another diff program, then I do commit . But the skin feels that it should not be so.

If together with Netbeans: I thought it would be easier with him, but the headache only increased. When I start a new project, it downloads it via FTP. Then I turn to the Group menu - SVN - Get, and should choose a folder.

Question: Should I choose the folder with the uploaded netbeans project and merge the files from / trunk there? Or separately?

If I download to a separate svn folder, then the system suggests that I create a project based on the downloaded one. But I already have a project, downloaded via FTP.

Question: There is an opportunity to connect these projects later: merged by FTP and merged by svn.

need help! Thanks in advance for any info or links.

I also searched the search and found a similar question a year ago, and although I discovered something new for myself, the questions did not dare.

    2 answers 2

    When I download a site via ftp I get one number of files, when through svn - another (less).

    Because some files are not registered in the repository.

    And the following questions are not entirely correct. When you download files via FTP, then there will be no .svn directories with the necessary data for working with the repository. Therefore, I advise you to install TortoiseSVN, download your project with it, then install a plug-in for working with SVN (it’s only one there, I don’t remember the name), and connect your downloaded project (as a project with existing sources) to netbins. After that, everything will work on URA, without any problems with trunks and FTP.

    PS: I use git myself;)

    • I do not put the conditions. The customer is not a server - subversion. The problem is that the project downloaded via svn is not complete, but according to the documentation, it does not include configuration files. Well, still a lot of little things are not included, without them the site on the local machine does not turn ... I went again to fight with netbeans. - City
    • Well, download the missing files on the FTP. If they are not added to the system, it may be for security reasons, or simply because the config cannot be changed. - Vitaly Dyatlov
    • Thank you, I am doing this now. - City

    I’ll probably say the classic thing but - read the documentation for SVN. Here is off site . But the books . I think there you will be able to quickly find the answer to your question.

    • Yes, thank you, I read the svn-book on the red-bin. So far, it helps in general in general terms. - City