# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1248020923 -7200
# Node ID cf7c6acb890e04e8fe8ea7a58ad54fbb2731e696
# Parent  bc1de09090bcd7ccf4f27c3f714bfc16f45d36b9# Parent  22979282d8cabd9038d6a04092666c4c17d7d6da
Merge with crew-stable

diff -r bc1de09090bc -r cf7c6acb890e contrib/win32/win32-build.txt
--- 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
 
diff -r bc1de09090bc -r cf7c6acb890e mercurial/windows.py
--- 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])
diff -r bc1de09090bc -r cf7c6acb890e tests/test-demandimport.py
--- 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)
diff -r bc1de09090bc -r cf7c6acb890e tests/test-demandimport.py.out
--- 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'>