Mercurial > hg
changeset 9178:cf7c6acb890e
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 19 Jul 2009 18:28:43 +0200 |
| parents | bc1de09090bc (current diff) 22979282d8ca (diff) |
| children | 9e5e2e07cf81 |
| files | |
| diffstat | 4 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/win32/win32-build.txt Sat Jul 18 22:28:28 2009 +0200 +++ b/contrib/win32/win32-build.txt Sun Jul 19 18:28:43 2009 +0200 @@ -21,6 +21,9 @@ The py2exe distutils extension http://sourceforge.net/projects/py2exe/ + GnuWin32 gettext utility + http://gnuwin32.sourceforge.net/packages/gettext.htm + Inno Setup http://www.jrsoftware.org/isinfo.php
--- a/mercurial/windows.py Sat Jul 18 22:28:28 2009 +0200 +++ b/mercurial/windows.py Sun Jul 19 18:28:43 2009 +0200 @@ -41,6 +41,7 @@ limit = 16000 l = len(s) start = 0 + self.softspace = 0; while start < l: end = start + limit self.fp.write(s[start:end])
--- a/tests/test-demandimport.py Sat Jul 18 22:28:28 2009 +0200 +++ b/tests/test-demandimport.py Sun Jul 19 18:28:43 2009 +0200 @@ -36,5 +36,5 @@ print "fred =", f(fred) print "re =", f(re) -print "re.stdout =", f(re.stdout) +print "re.stderr =", f(re.stderr) print "re =", f(re)
--- a/tests/test-demandimport.py.out Sat Jul 18 22:28:28 2009 +0200 +++ b/tests/test-demandimport.py.out Sun Jul 19 18:28:43 2009 +0200 @@ -11,5 +11,5 @@ fred.sub = <function sub at 0x?> fred = <proxied module 're'> re = <unloaded module 'sys'> -re.stdout = <open file '<stdout>', mode 'w' at 0x?> +re.stderr = <open file '<stderr>', mode 'w' at 0x?> re = <proxied module 'sys'>