This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Under some circumstances, Netbeans forgets to commit some files to svn. When this happens, the diff is also *not* showing these files. It seems to happen frequently when modifying files, doing an svn up and then committing. When a file gets into that state, the only possible way we can commit it using the IDE is to right click on it, and then do the commit. Closing the IDE and re-opening it also doesn't help. If I can find a stable procedure that always reproduce it, I'll add it as a comment later.
The files are modified inside IDE? Or externally? If they're modified inside the netbeans editor, subversion should be notified about the change and correctly treat the file as modified. On the other hand, if you modified a file outside (externally with another tool), subversion may not capture the change and you would be forced to manually call a status refresh (Subversion > Show changes). > the only possible way we can commit it using the IDE is... And have you tried Subversion > Show changes? It should rescan the whole selection and refresh file statuses.
(In reply to comment #1) > The files are modified inside IDE? Or externally? If they're modified inside > the netbeans editor, subversion should be notified about the change and > correctly treat the file as modified. > [...] This is mainly the problem. I'm never using another editor to modify the files other than Netbeans. > > the only possible way we can commit it using the IDE is... > And have you tried Subversion > Show changes? It should rescan the whole > selection and refresh file statuses. I'll keep this in mind and try it out the next time I reproduce the issue. I've always used the 'Diff' option instead of 'Show Changes'. I was under the impression it would also notify the subversion module that changes exist somewhere.
Diff action does not force the status rescan, only Show changes does. The diff action just pulls modified files from the status cache. I'll integrate a fix next week which forces the status rescan in the commit dialog, so no files should be forgotten after the fix. However it won't solve the missing files in the diff. It would help very much if you could describe the scenario next time you get into the trouble .
OK, next time I get it, I'll save my entire ~/.netbeans directory and include a detailed list of the actions taken.
I've been experiencing this issue since at least netbeans 6.5.1. I don't have a procedure either hence why I never reported it. Is there anything in the ~/.netbeans that would help us understand what is going on?
I reproduced that broken state again. The steps that I used today were: 1. Open Netbeans 2. Modify a few files 3. Do 2 commits while excluding 2 modified files from them 4. Merge upstream patches 5. Do one commit including all the modified files => One of the 2 modified files that was excluded in step #2 wasn't committed. My Netbeans project group currently hold 5 projects. The two files that I didn't want to commit in step #2 were in the same project, but different java packages. I did save my whole ~/.netbeans directory, so if I can look at something to give out more details, let me know. Also, I can confirm that doing 'Subversion > Show Changes' will fix this forgotten file.
bug 116104 fixed: files shoud not be forgotten if you run commit from the projects/files view. i'll try to follow your steps and fix the missing files in diff if i am able to reproduce.
> 5. Do one commit including all the modified files > => One of the 2 modified files that was excluded in step #2 wasn't committed. So the file was not even listed in the commit dialog? That's really weird since it should be known as modified (in step 3 it was already modified and you had to exclude it). Could you then send ~/.netbeans/6.8/var/cache/svncache folder to my email and tell me the path to the forgotten file. I'll check its status in the cache. Also please look into ~/.netbeans/6.8/config/Preferences/org/netbeans/modules/subversion.properties and send me all rows starting with 'commitExclusions.' thanks Just to be sure: you didn't forgotten to include the file in commit again, did you?
(In reply to comment #8) > > 5. Do one commit including all the modified files > > => One of the 2 modified files that was excluded in step #2 wasn't committed. > So the file was not even listed in the commit dialog? That's really weird since > it should be known as modified (in step 3 it was already modified and you had > to exclude it). Exactly. The first time, I excluded it in the commit dialog and then I wanted to commit it later. At this point, it didn't show up in this dialog. > Could you then send ~/.netbeans/6.8/var/cache/svncache folder > to my email and tell me the path to the forgotten file. I'll check its status > in the cache. > Also please look into > ~/.netbeans/6.8/config/Preferences/org/netbeans/modules/subversion.properties > and send me all rows starting with 'commitExclusions.' > thanks Sure, I'll gather this information for you soon. > Just to be sure: you didn't forgotten to include the file in commit again, did > you? No, I'm always committing by right click on the project (or multiple projects) in Netbeans. I'm rarely selecting the files to commit. However, selecting the file to commit fixes the issue when the file has been forgotten in a previous commit.
The 'Show Changes' workaround is not always working. Right now, in Netbeans, I have a file that is blue. If I try to commit all my projects, the file doesn't appear in the commit window. So I clicked on the Project and do 'Show Changes'. The cache was *not* refreshed and Netbeans refuse to commit that file. I clicked on its package, did 'Show Changes' again... same thing. Netbeans really doesn't want to commit it. Then I right click on the file and did 'Show Changes'. The file was obviously shown in the list of modified files. But then, doing show changes from either the project and/or the package still doesn't show it. Netbeans is very strict... it doesn't want to commit it.
(In reply to comment #10) That's really weird... I believe the cache is correctly refreshed and that the file is held in the cache as modified, but that the cache itself doesn't want to yield the file (because it thinks it doesn't lies under the requested folder/package or whatever). I'm affraid there's no way we can solve this only with discussions. Do you think i can send you a patched subversion module with some additional logging and you would send me the results back?
Sure, if it doesn't affect the privacy of the code, I have no problem doing that.
anyone still able to reproduce this, please: - make a screenshot of the package in the projects view (so i can see the file in question) - make a screenshot of the status window (Svn -> Show Changes on the package view) - make a screenshot of the commit dialog (Subversion -> Commit called on the package) for the whole time i have never been able to reproduce it. Thank you.
I have had this issue since around 6.5 and I still regularly encounter it with current versions. I just had the issue on a 8.0.2 install. It seems totally random. When it happens, forcing a refresh or restarting the IDE will sometimes help, although the issue will usually come back shortly after. I can provide screenshots or logs to track this down.
Hello, It may sounds late to talk on this post but I have the same problem. Netbeans doesn't detect all the modified files even if I restart or refresh. The solution to commit file by file by right clicking on it->subversion->commit is a little annoying because I'm working with a team. Also, I want to point out that netbeans detect modified files but one by one, when the current tab is on the file. I hope it will be solve quickly... Thank you
Please make a few screenshots as i asked in Comment #13.