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: | Moving LocallyAdded file not permitted | ||
|---|---|---|---|
| Product: | versioncontrol | Reporter: | Padraig Obriain <padraigob> |
| Component: | Mercurial | Assignee: | issues@versioncontrol <issues> |
| Status: | RESOLVED FIXED | ||
| Severity: | blocker | ||
| Priority: | P3 | ||
| Version: | 6.x | ||
| Hardware: | Sun | ||
| OS: | All | ||
| Issue Type: | DEFECT | Exception Reporter: | |
| Attachments: |
Patch for this bug
proposed patch |
||
|
Description
Padraig Obriain
2007-04-27 10:12:57 UTC
Created attachment 41815 [details]
Patch for this bug
If the from file is LocallyAdded we do hg remove -f on it and do hg add on the to file; otherwisae we call hg rename -A Will fix in rev 1.1 by doing the hg rm -f on the locally added file before the move completes. Patch committed. Seeing different behavior - the rename fails and there is an Output error. You can commit the NewFile but the status in the Project view does not get updated until you go and add another file. The rework on Rename has caused this regression. Created attachment 51598 [details]
proposed patch
IDE:------------------------------------------------- IDE: [10/24/07 4:38 PM] Committing started Checking in MercurialInterceptor.java; /shared/data/ccvs/repository/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/MercurialInterceptor.java,v <-- MercurialInterceptor.java new revision: 1.10; previous revision: 1.9 done IDE: [10/24/07 4:38 PM] Committing finished |