Mercurial > hg

changeset 6480:ee7762515a41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 05 Apr 2008 18:19:49 +0200
parents a135374ed5fc (current diff) 31abcae33b4f (diff)
children ab8038bf5127
files
diffstat 3 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Sat Apr 05 17:48:10 2008 +0200
+++ b/mercurial/dirstate.py	Sat Apr 05 18:19:49 2008 +0200
@@ -407,6 +407,8 @@
         return False
 
     def _dirignore(self, f):
+        if f == '.':
+            return False
         if self._ignore(f):
             return True
         for c in strutil.findall(f, '/'):
--- a/tests/test-hgignore	Sat Apr 05 17:48:10 2008 +0200
+++ b/tests/test-hgignore	Sat Apr 05 18:19:49 2008 +0200
@@ -40,6 +40,10 @@
 echo ".*\.o" > .hgignore
 echo "--" ; hg status
 
+# Check it does not ignore the current directory '.'
+echo "^\." > .hgignore
+echo "--" ; hg status
+
 echo "glob:**.o" > .hgignore
 echo "--" ; hg status
 
--- a/tests/test-hgignore.out	Sat Apr 05 17:48:10 2008 +0200
+++ b/tests/test-hgignore.out	Sat Apr 05 18:19:49 2008 +0200
@@ -15,6 +15,12 @@
 ? syntax
 --
 A dir/b.o
+? a.c
+? a.o
+? dir/c.o
+? syntax
+--
+A dir/b.o
 ? .hgignore
 ? a.c
 ? syntax