# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1224414036 -7200
# Node ID e62c33732c1815f11b78ddaa8bf3a06bf524957e
# Parent  fb3df69aa78567b1022595e15b6b01feb81e381e# Parent  89431fbe0524a9be44f3260750e5412176c0bd2e
merge with crew

diff -r fb3df69aa785 -r e62c33732c18 mercurial/util.py
--- a/mercurial/util.py	Sun Oct 19 12:23:58 2008 +0200
+++ b/mercurial/util.py	Sun Oct 19 13:00:36 2008 +0200
@@ -76,9 +76,9 @@
         return p
 except ImportError:
     subprocess = None
-    import popen2 as _popen2
+    from popen2 import Popen3
     popen2 = os.popen2
-    Popen3 = _popen2.Popen3
+    popen3 = os.popen3
 
 
 try:
diff -r fb3df69aa785 -r e62c33732c18 tests/test-notify
--- a/tests/test-notify	Sun Oct 19 12:23:58 2008 +0200
+++ b/tests/test-notify	Sun Oct 19 13:00:36 2008 +0200
@@ -83,4 +83,5 @@
 hg --cwd b rollback
 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
   -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/' \
-  -e 's/^Date:.*/Date:/'
+  -e 's/^Date:.*/Date:/' \
+  -e 's/^1 files changed/1 file changed/'