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.
Sometime (like right now) when I svn update and a conflict is been created, it happens that the svn marked the whole file as 'changed' although in reality only a couple of lines had changed. Especially in a large file (like mine had 500 lines) it's impossible to see the actual difference. So what I usually do is to copy each part in a separate file and open 'meld' to compare them and resolve the conflict. Netbeans should definitely provide some sort of support here, since this has been an issue already for a long time. There should be some sort additional 'diff' algorithm on each 'mine'/'remote' sections, maybe something you can turn on/off if needed. Product Version = NetBeans IDE 7.4 (Build 201310111528) Operating System = Linux version 3.8.0-32-generic running on amd64 Java; VM; Vendor = 1.7.0_45 Runtime = Java HotSpot(TM) 64-Bit Server VM 24.45-b08
Created attachment 144021 [details] IDE log
I don't understand. What is the content of the file? Or more importantly, where are the conflict markers located in the file? Do they enclose the whole file's content? If so then the file truly changed completely. Most likely because of incorrect line-endings. Are you sure all your colleagues commit their files with '\n' line-endings?
I cannot say - it's hard in such a big where teams are spread in several countries to track these things. But I already saw that a couple of times in older Netbeans versions, that whole large blocks of code where 'marked' as changed, although only some small changes where made in one line - and the only 'senseable' way to check what the actual difference was to copy the two blocks in an external diff editor - like 'meld' in linux to see the actual differences, which was only one or two lines... Even the internal Netbeans 'diff' editor is a LOT better than the 'resolve conflict' (three way) editor - which only seems to show the text blocks that have been marked by svn as different. Could you add 'diff' functionality on the two supposedly 'changed' blocks to see the actual intext differences?