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 177143

Summary: [68cat] Conflict resolved while still updating prevents commit
Product: versioncontrol Reporter: matthies <matthies>
Component: CVSAssignee: Ondrej Vrabec <ovrabec>
Status: NEW ---    
Severity: normal    
Priority: P3    
Version: 6.x   
Hardware: PC   
OS: Windows XP   
Issue Type: DEFECT Exception Reporter:

Description matthies 2009-11-18 16:18:46 UTC
When resolving a CVS update conflict while the update is still running, then when trying to commit after the update has finished, NB prevents the commit, saying that the file with the resolved conflict was modified remotely. One has to update again for NB to notice that the file is only modified locally.

An example in more detail:
- I have a large project with a changelog file close to the root folder.
- I make a couple of changes to the sources and add some comments about the changes at the top of the changelog.
- Before I commit my changes, I run Update on the project.
- Soon after the update has started, a conflict becomes apparent on the changelog file because there were remote changes and someone added some other comments at the top of the file as well.
- While the update is still running (it will take a minute or two to finish), I edit the changelog file and save it, thereby resolving the conflict.
- The update finishes and a message box tells me that the update created conflicts. Which isn't wrong, although at that point the conflicts have already been resolved.
- After the update has finished, I try to commit my changes. But the commit dialog lists the changelog file as "remotely modified" (which is wrong), and doesn't allow the commit to be performed.