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.

Bug 65955 - [50cat] File marked as modified without having all conflicts solved
Summary: [50cat] File marked as modified without having all conflicts solved
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 5.x
Hardware: PC Windows XP
: P3 blocker with 1 vote (vote)
Assignee: issues@versioncontrol
Depends on:
Reported: 2005-10-05 12:57 UTC by misterm
Modified: 2007-01-04 17:14 UTC (History)
0 users

See Also:
Exception Reporter:


Note You need to log in before you can comment on or make changes to this bug.
Description misterm 2005-10-05 12:57:16 UTC
[ 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.
Comment 1 Maros Sandor 2005-10-05 13:13:35 UTC
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
Comment 2 misterm 2005-10-05 13:27:14 UTC
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?
Comment 3 Maros Sandor 2005-10-05 14:48:55 UTC
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.
Comment 4 misterm 2005-10-05 16:09:31 UTC
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.