# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1207412389 -7200
# Node ID ee7762515a41b682cb1ffc4c83cead9c1e0d6700
# Parent  a135374ed5fcdd6ecf8ce253056a779e609d57ad# Parent  31abcae33b4f22cea9d0db5fdfa5f3f11370dd06
Merge with crew-stable

diff -r a135374ed5fc -r ee7762515a41 mercurial/dirstate.py
--- 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, '/'):
diff -r a135374ed5fc -r ee7762515a41 tests/test-hgignore
--- 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
 
diff -r a135374ed5fc -r ee7762515a41 tests/test-hgignore.out
--- 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