# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/Bundle.properties --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/Bundle.properties Base (1.4) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/Bundle.properties Locally Modified (Based On 1.4) @@ -88,6 +88,7 @@ MSG_Update_Conflicts=Mercurial update caused conflicts\! MSG_Update_Completed=Mercurial update completed MSG_Update_Progress=Updating... +MSG_Revert_Progress=Reverting... CTL_MenuItem_UpdateAll=Updat&e All Files ## Revert Panel Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsAction.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsAction.java Base (1.6) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/ui/update/RevertModificationsAction.java Locally Modified (Based On 1.6) @@ -99,7 +99,7 @@ performRevert(repository, revStr, files); } }; - support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(UpdateAction.class, "MSG_Update_Progress")); // NOI18N + support.start(rp, repository.getAbsolutePath(), org.openide.util.NbBundle.getMessage(UpdateAction.class, "MSG_Revert_Progress")); // NOI18N return; } Index: versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java --- versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java Base (1.22) +++ versioncontrol/mercurial/src/org/netbeans/modules/mercurial/util/HgUtils.java Locally Modified (Based On 1.22) @@ -575,9 +575,8 @@ cache.refreshFileStatus(aFile, fi, null); } } - } else { - cache.refresh(file, FileStatusCache.REPOSITORY_STATUS_UNKNOWN); } + } catch (HgException ex) { } }