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.
Hi, i've fallen into a trap. See: http://tortoisesvn.tigris.org/servlets/ReadMsg?list=users&msgNo=6875 Reason: NetBeans can't execute diff and/or commit on EOL disparity.
Next I have tried a commit to the whole package, because the menu was enabled here. Only the folder and a new file (which I excluded from this commit) were listed in the commit window. After executing, the EOLs have been updated, so I found a workaround. :-) ... but another file in a sub-package of this, which was modified, was committed too, even though it was not listed in the commit's window (so I couldn't exclude it by hand). :-( Conclusion: there are listed not all of the items in the commit window, which come to process by the commit action. :-(
any idea why the folder was listed in the commit window? did you change some properties on it? note that setting a file on ignored could be also a reason for a folder being scheduled for commit.
Created attachment 45069 [details] The commit before last was only against the subfolder
this looks like two different things to me: 1.) the originally reported EOL problem 2.) that modified files from a subpackage get commited even if they aren't listed in the commit dialog. This one is a duplicate - see issue #106972. at this place we should address only 1.) as 2.) is covered by issue #106972.
Yes, that's it. ... but don't forget, that not only the files from the subfolder are not listed, but also files which only differ by their EOLs. They are committed too, but shouldn't if not listed.
there is no dependency on 106972
The netbeans diff ignores EOL markers. This is WAD.
So what's the official behaviour now for files which are selected by package-commit and which only differ by their EOLs: 1.) They are not listed, but noteless committed too ? 2.) They are neither listed, nor committed ?
1.) if the EOL differs then the files are marked as modified in the project view (blue color), they will be listed in the commit dialog and they will be commited - this all because they are indeed modified. 2.) the netbeans diff component ignores different EOL. this is how it was designed and how it works. The diff works the same way for svn, cvs, hg, p4 or even if diffing files which aren't versioned. There is no way how the svn module could change this behavior. 3.) i have no idea how it came that the EOLs got changed in your file - as much as i know the editor saves files in the same format as they were opened (as long there is no mixed state - windows- and unixlike in one file). Again - if there really was changed the EOL style - this has generally seen nothing to do with the svn module