From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 13 Apr 2010 17:37:01 +0000 (+0000)
Subject: Merged revisions 80060 via svnmerge from
X-Git-Tag: v3.2a1~1152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b82f990cb57035daa6de4c0df9911ba8461a963;p=python

Merged revisions 80060 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80060 | antoine.pitrou | 2010-04-13 19:36:07 +0200 (mar., 13 avril 2010) | 5 lines

  Fix overzealous patterns in .hgignore, which used to hide files containing e.g. "python".

  (also an occasional source of bugs on the hgsvn-generated hg mirrors)
........
---

diff --git a/.hgignore b/.hgignore
index c6f1f0fbaa..3ed3aefb66 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,23 +1,23 @@
 .gdb_history
 .purify
-.svn
+.svn/
 Makefile$
 Makefile.pre$
-TAGS
-autom4te.cache
-build
-buildno
+TAGS$
+autom4te.cache$
+build/
+buildno$
 config.cache
 config.log
 config.status
 config.status.lineno
 db_home
-platform
-pyconfig.h
-python
-python.exe
-reflog.txt
-tags
+platform$
+pyconfig.h$
+python$
+python.exe$
+reflog.txt$
+tags$
 Lib/plat-mac/errors.rsrc.df.rsrc
 Doc/tools/sphinx/
 Doc/tools/docutils/
@@ -25,13 +25,13 @@ Doc/tools/jinja/
 Doc/tools/jinja2/
 Doc/tools/pygments/
 Misc/python.pc
-Modules/Setup
+Modules/Setup$
 Modules/Setup.config
 Modules/Setup.local
 Modules/config.c
-Parser/pgen
-core
-python-gdb.py
+Parser/pgen$
+^core
+^python-gdb.py
 
 syntax: glob
 libpython*.a