Mercurial > hg > easyhg

diff src/filestatuswidget.cpp @ 421:653e9694a694 ignore

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use regexes for anchored filenames (i.e. "this file only" and directory); report outcome of ignore to user
author Chris Cannam
date Fri, 17 Jun 2011 11:07:30 +0100
parents 2a19d5706673
children c6ea3eb00635
line wrap: on
line diff
--- a/src/filestatuswidget.cpp	Thu Jun 16 22:21:00 2011 +0100
+++ b/src/filestatuswidget.cpp	Fri Jun 17 11:07:30 2011 +0100
@@ -68,7 +68,8 @@
     m_actionLabels[FileStates::RedoMerge] = tr("Redo merge");
     m_actionLabels[FileStates::MarkResolved] = tr("Mark conflict as resolved");
     m_actionLabels[FileStates::Ignore] = tr("Ignore...");
-    m_actionLabels[FileStates::UnIgnore] = tr("Stop ignoring...");
+    // Unignore is too difficult in fact, so we just offer to edit the hgignore
+    m_actionLabels[FileStates::UnIgnore] = tr("Edit .hgignore File");
 
     m_descriptions[FileStates::Clean] = tr("You have not changed these files.");
     m_descriptions[FileStates::Modified] = tr("You have changed these files since you last committed them.");