I have been trying to bring the netbeans project configuration up to date. Although I have a good version of the file, I have been getting very confused by the way subversion has been processing my commands.
I have spent a lot of time reading the svn manual and faq, but the only way I can detect my problems is to commit what looks like a good change (from my working directory) and then run an update to discover the results are not what I want. I am using linux svn commands most of the time, because you cannot use netbeans to manipulate its own control files.
The behaviour is so wierd that I cannot even be certain I am describing it properly. I need to fix this quickly, but don't know what more to do... can anyone help me, please?
The trunk '.' has an svn:ignore properties list that includes the line "nbproject". I presume this was automatically converted from the .cvsignore file and I take it to mean "ignore the contents of ./nbproject", but perhaps I am wrong?
The trunk SHOULD look like this...
./nbproject/project.xml - user's local file locally modified and NEVER committed.
./ide/nbproject/project.xml - repository template file under svn control.
It seems as if changes to ide/nbproject/ are translated into changes to nbproject/, and vice versa. The best I've been able to do is to have both directories identical, but that is WRONG.
Here's an example...
1. svn propedit svn:ignore nbproject/ (to ignore nbproject/project.xml) fails to commit because nbproject/project.xml exists in the repository.
2. svn delete nbproject/project.xml commits OK.
3. svn update nbproject/project.xml leaves local nbproject/ empty as desired.
4. svn update ide/nbproject/project.xml ought to have no effect, BUT it actually deletes the file! ide/nbproject/project.xml no longer exists in the repository, so it MUST have been removed in error!
Can anyone suggest what I am doing wrong? I don't want to keep going in circles while messing up the repository.