Mercurial > hg-stable
changeset 7167:e62c33732c18
merge with crew
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 19 Oct 2008 13:00:36 +0200 |
| parents | fb3df69aa785 (current diff) 89431fbe0524 (diff) |
| children | 834b8d7bd597 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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/'