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.
Product Version: NetBeans IDE 6.0 (Build 200711261600) Java: 1.6.0_03; Java HotSpot(TM) Client VM 1.6.0_03-b05 System: Windows XP version 5.1 running on x86; Cp1252; en_GB (nb) Userdir: D:\ide\60daily\user While merge is run, files like <file_name>.org.212 and similar are created. They should be ignored, but they are locally new.
If the user does not have a .hgignore file then one is created and *.orig is added, on Windows it appears that *.orig.* also needs to be added. However, there is a general .hgignore problem. The problem is that if the user already has a .hgignore file then these entries are never added, so both *.orig and *.orig.* files will appear as Locally New. We need to look at prompting the user before Merge or Revert Modifications are run (both can generate *.orig files), if we detect that they have a .hgignore file and it does not have these entries. If they want at that point we can then add these entries for them.
Note: we need to make sure to check not just for <project>/.hgignore but also for [ui] ignore=<ignore_file_per_user> entries in ~/.hgrc as they may be using a custom user wide ignore pattern file.
Created attachment 54113 [details] Proposed patch
Patch fixes Windows specific problem for Merge files only. Still need generic fix.
IDE:------------------------------------------------- IDE: [11/12/07 22:09] Committing started Checking in HgUtils.java; /cvs/versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java,v <-- HgUtils.java new revision: 1.24; previous revision: 1.23 done IDE: [11/12/07 22:09] Committing finished
Verified.