# HG changeset patch # User Patrick Mezard # Date 1272285634 -7200 # Node ID bb377a311109b472dee42a84e196d070173a7a70 # Parent b3af02b1f19fa8ece30b6a0ff664548b879c9ac2 test-convert-git: be tolerant to git output variants diff -r b3af02b1f19f -r bb377a311109 tests/test-convert-git --- 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 diff -r b3af02b1f19f -r bb377a311109 tests/test-convert-git.out --- 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: