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.
| Summary: | Side bar diff indicates modifications after Rollback. | ||
|---|---|---|---|
| Product: | versioncontrol | Reporter: | Peter Pis <ppis> |
| Component: | Mercurial | Assignee: | issues@versioncontrol <issues> |
| Status: | VERIFIED FIXED | ||
| Severity: | blocker | ||
| Priority: | P3 | ||
| Version: | 6.x | ||
| Hardware: | All | ||
| OS: | All | ||
| Issue Type: | DEFECT | Exception Reporter: | |
| Attachments: | proposed patch | ||
Unable to reproduce at the minute, but will continue to investigate. I can reproduce this. mercurial thinks that there is no change to the file after the rollback and forced update and there is no difference between the file in the working directory and the latest version in the repository. Need to add a refresh if the rollback effects any files in the project. Should also resolve the test case reported in 103125. Created attachment 42106 [details]
proposed patch
This patch has been committed. Seems to work fine now. Verified. (070516) |
NetBeans IDE 6.0 Preview (M9, build 070501) 1.6.0-rc; Java HotSpot(TM) Client VM 1.6.0-rc-b101 Windows XP version 5.1 running on x86 en_GB (nb); Cp1252 Steps: 1. Create new project, select project root and invoke "Versioning | Mercurial | Initialize" action. 2. Select project root and invoke "Mercurial | Status" action on it. 3. Modify (Remove some lines) and save some file. Commit changes. 4. Select this file and invoke "Mercurial | Rollback". Confirm upcoming dialog. The content of the file is correct but the side bar diff indicates the the lines were removed while "Mercurial" ("Mercurial | Status") view is not aware of any changes.