# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1272297731 18000
# Node ID 11569b997f81f977b2741e0b7d55fd4f604f8efa
# Parent  9fb09fc3ea3c28658133e6bd70f3abe6f8ec3612# Parent  bb377a311109b472dee42a84e196d070173a7a70
Merge with stable

diff -r 9fb09fc3ea3c -r 11569b997f81 tests/test-convert-git
--- 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
diff -r 9fb09fc3ea3c -r 11569b997f81 tests/test-convert-git.out
--- 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: