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.
Product Version: NetBeans IDE Dev (Build 200803251204) Java: 1.6.0_10-beta; Java HotSpot(TM) Client VM 11.0-b11 System: Windows XP version 5.1 running on x86; Cp1250; cs_CZ (nb) Observed: The merge conflicts resolver tab doesnt show on which line is the conflict(the conflict was on single line(changed value of variable)), it instead shows both versions with red background(the whole file in both cases). There is no hint as to where is the conflicting part of file. Expected: Only the line with conflict should be marked. Steps to reproduce: have some svn versioned project -> 1. Modify "Main.java" file and save it. 2. Invoke Versioning | Check out... from main menu and change the "Workfile location". 3. Open the same project, modify "Main.java" class at the same line and commit it. 4. Return to previous project, select the project root and invoke Subversion | Update with Dependencies popup menu action. 5. Invoke Subversion | Resolve conflicts popup menu action on "Main.java" node.
could it be your whole file was in conflict?
no - the conflict was only in one line - i only changed the type and value of one variable - it is true that the behavior would be correct if the whole file were in conflict, but it was not.
> ... i only changed the type and value of one variable the wasn't what you did but what you got:) how does the conflicted files look like when you open it in the editor? are the conflict marks only around the place you changed?
Updated steps to reproduce: 1.Create new java application 2. Import it to the svn repository 3. Create in the main.java file some variable, save it. 4. Commit it. 5. Invoke Versioning | Check out... from main menu and change the "Workfile location". 6. In the newly opened version of the project change the value of variable, save, commit. 7. In the older version of the project change the value, save, update with dependencies 8. Resolve the conflict. 9. If u dont get the error repeat steps 6-8 until u do This defect seems to appear ONLY on windows machines
Created attachment 60049 [details] zipped files in conflict
There is no other difference between the files than the changed value of the variable, so it is baffling why this occurs.
the svn cli marked the whole file as in conflict - this is nothing we could fix in the nb module
ok
*** Issue 136900 has been marked as a duplicate of this issue. ***
*** Issue 154899 has been marked as a duplicate of this issue. ***