Mercurial > hg-stable
changeset 11773:6a5e159eb93e
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 09 Aug 2010 16:55:53 -0500 |
| parents | b0e3d3973440 (current diff) 423ece53380e (diff) |
| children | 91c4e6d2c9e5 5a64302e5d3a |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-dispatch Mon Aug 09 12:25:01 2010 -0500 +++ b/tests/test-dispatch Mon Aug 09 16:55:53 2010 -0500 @@ -22,8 +22,8 @@ hg cat a echo '% working directory removed' -rm -rf $dir/a -hg --version +sh -c "cd $dir && rm -rf a" +hg --version 2>&1 | sed -e 's,\(abort:.*:\).*$,\1 ...,g' echo '% no repo' cd $dir
--- a/tests/test-dispatch.out Mon Aug 09 12:25:01 2010 -0500 +++ b/tests/test-dispatch.out Mon Aug 09 16:55:53 2010 -0500 @@ -34,6 +34,6 @@ a a: No such file in rev 000000000000 % working directory removed -abort: error getting current working directory: No such file or directory +abort: error getting current working directory: ... % no repo abort: There is no Mercurial repository here (.hg not found)!