Mercurial > hg
changeset 10990:bb377a311109 stable
test-convert-git: be tolerant to git output variants
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 26 Apr 2010 14:40:34 +0200 |
| parents | b3af02b1f19f |
| children | 11569b997f81 a0102da324ab |
| files | tests/test-convert-git tests/test-convert-git.out |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-git Sun Apr 25 23:07:46 2010 +0200 +++ b/tests/test-convert-git Mon Apr 26 14:40:34 2010 +0200 @@ -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 Sun Apr 25 23:07:46 2010 +0200 +++ b/tests/test-convert-git.out Mon Apr 26 14:40:34 2010 +0200 @@ -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: