diff options
| author |   Antonio Cuni <anto.cuni@gmail.com> | 2011-05-02 14:09:47 +0200 |
|---|---|---|
| committer | Antonio Cuni <anto.cuni@gmail.com> | 2011-05-02 14:09:47 +0200 |
| commit | 26f7634aa3a93ab739b0d5c4988195dd6f8fd1ec (patch) | |
| tree | 5c9f065cdbd082a1bcbbcbce83d46446852c8d6d /.hgignore | |
| parent | it is "import time" that makes it hanging (diff) | |
| parent | Merged upstream. (diff) | |
| download | pypy-26f7634aa3a93ab739b0d5c4988195dd6f8fd1ec.tar.gz pypy-26f7634aa3a93ab739b0d5c4988195dd6f8fd1ec.tar.bz2 pypy-26f7634aa3a93ab739b0d5c4988195dd6f8fd1ec.zip | |
hg merge default
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -5,6 +5,8 @@ syntax: glob syntax: regexp ^testresult$ ^site-packages$ +^site-packages/.*$ +^site-packages/.*$ ^bin$ ^pypy/bin/pypy-c ^pypy/module/cpyext/src/.+\.o$ @@ -15,6 +17,7 @@ syntax: regexp ^pypy/module/cpyext/test/.+\.manifest$ ^pypy/module/test_lib_pypy/ctypes_tests/.+\.o$ ^pypy/doc/.+\.html$ +^pypy/doc/config/.+\.rst$ ^pypy/doc/basicblock\.asc$ ^pypy/doc/.+\.svninfo$ ^pypy/translator/c/src/libffi_msvc/.+\.obj$ @@ -37,8 +40,6 @@ syntax: regexp ^pypy/translator/goal/.+\.dll$ ^pypy/translator/goal/target.+-c$ ^pypy/_cache$ -^site-packages/.+\.egg$ -^site-packages/.+\.pth$ ^pypy/doc/statistic/.+\.html$ ^pypy/doc/statistic/.+\.eps$ ^pypy/doc/statistic/.+\.pdf$ |