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.
[ BUILD # : 5.0 beta ] [ JDK VERSION : 1.4.2_xx ] After using the Resolve Conflicts/Merge window and resolving 2 out of 3 conflicts, I save my changes. A few seconds next, the file is shown as Locally Modified in the Versioning window, even though there is still one conflict pending. Besides that, Resolve Conflicts becomes disabled after that, making it harder to resolve the third issue.
After timestamp of the file changes, we assume that all conflicts has been resolved. Otherwise we would have to scan all modified text files for conflict markers.
Well, in my opinion it's actually a DEFECT and a P2 since it can lead to corrupt files. I won't change it though to see what you think. No chance of getting this fixed for 5.0?
Citing from CVS manual: "Currently to resolve a conflict, you must change the timestamp on the file. In previous versions of CVS, you also needed to insure that the file contains no conflict markers. Because your file may legitimately contain conflict markers (that is, occurrences of `>>>>>>> ' at the start of a line that don't mark a conflict), the current version of CVS will print a warning and proceed to check in the file." To be consistent with standard CVS client, once you modify a file, it is no longer considered a conflict. Updating may mark it as conflict again.
Well, since we are talking about Resolve Conflicts/Merge window, when a file is saved using it and not all conflicts have been solved, javacvs could keep it marked as having a conflict.