[pypy-commit] pypy more-rposix: hg merge default

2015-05-31 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r77726:8b3729487d48 Date: 2015-05-31 19:30 +0200 http://bitbucket.org/pypy/pypy/changeset/8b3729487d48/ Log:hg merge default diff too long, truncating to 2000 out of 35120 lines diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.h

[pypy-commit] pypy more-rposix: hg merge default

2015-05-17 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r77366:34b437c9bc0c Date: 2015-05-17 20:51 +0200 http://bitbucket.org/pypy/pypy/changeset/34b437c9bc0c/ Log:hg merge default diff too long, truncating to 2000 out of 6416 lines diff --git a/lib-python/2.7/socket.py b/lib-python/2.7

[pypy-commit] pypy more-rposix: hg merge default

2015-05-03 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r77014:8a0a9728af1b Date: 2015-05-03 18:37 +0200 http://bitbucket.org/pypy/pypy/changeset/8a0a9728af1b/ Log:hg merge default diff too long, truncating to 2000 out of 4936 lines diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LIC

[pypy-commit] pypy more-rposix: hg merge default

2015-05-03 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r77004:bbd40bb55e9d Date: 2015-04-23 23:28 +0200 http://bitbucket.org/pypy/pypy/changeset/bbd40bb55e9d/ Log:hg merge default diff too long, truncating to 2000 out of 6881 lines diff --git a/.tddium.requirements.txt b/.tddium.requir

[pypy-commit] pypy more-rposix: hg merge default

2015-04-06 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r76718:7c1b71e49c90 Date: 2015-04-04 18:58 +0200 http://bitbucket.org/pypy/pypy/changeset/7c1b71e49c90/ Log:hg merge default diff too long, truncating to 2000 out of 68117 lines diff --git a/.gitignore b/.gitignore --- a/.gitignore

[pypy-commit] pypy more-rposix: hg merge default

2014-12-13 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r74907:f566a4468a10 Date: 2014-12-13 11:33 +0100 http://bitbucket.org/pypy/pypy/changeset/f566a4468a10/ Log:hg merge default diff too long, truncating to 2000 out of 2781 lines diff --git a/lib-python/2.7/sqlite3/test/dbapi.py b/l

[pypy-commit] pypy more-rposix: hg merge default

2014-12-05 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r74844:511d0dd384da Date: 2014-12-05 22:06 +0100 http://bitbucket.org/pypy/pypy/changeset/511d0dd384da/ Log:hg merge default diff too long, truncating to 2000 out of 20185 lines diff --git a/lib-python/2.7/subprocess.py b/lib-pytho

[pypy-commit] pypy more-rposix: hg merge default

2014-11-05 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: more-rposix Changeset: r74346:6f17e9b7ff10 Date: 2014-11-05 18:41 +0100 http://bitbucket.org/pypy/pypy/changeset/6f17e9b7ff10/ Log:hg merge default diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -37,4 +37,4 @@ to use virtualenv