Mercurial > hg-stable
changeset 10991:11569b997f81
Merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 26 Apr 2010 11:02:11 -0500 |
| parents | 9fb09fc3ea3c (current diff) bb377a311109 (diff) |
| children | a9b8c8c8ce80 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-git Fri Apr 23 14:29:44 2010 +0200 +++ b/tests/test-convert-git Mon Apr 26 11:02:11 2010 -0500 @@ -181,6 +181,6 @@ EOF python damage.py hg convert git-repo4 git-repo4-broken-hg 2>&1 | \ - sed 's/fatal:.*/fatal: git error/g' + grep 'abort:' | sed 's/abort:.*/abort:/g' true
--- a/tests/test-convert-git.out Fri Apr 23 14:29:44 2010 +0200 +++ b/tests/test-convert-git.out Mon Apr 26 11:02:11 2010 -0500 @@ -128,10 +128,4 @@ initializing destination git-repo4-sourcesort-hg repository abort: --sourcesort is not supported by this data source % damage git repository and convert again -fatal: git error -initializing destination git-repo4-broken-hg repository -scanning source... -sorting... -converting... -1 addfoo -abort: cannot read changes in 6a101ac3f6d8b2524a64295ffd9be87ed927bfeb +abort: