diff -r eae4553b2763 -r f29b7c8419cb tests/test-convert-darcs --- a/tests/test-convert-darcs Sun Dec 16 22:55:23 2007 +0100 +++ b/tests/test-convert-darcs Fri Dec 21 12:07:02 2007 +0100 @@ -26,7 +26,7 @@ cd .. echo % branch and update -darcs get darcs-repo darcs-clone +darcs get darcs-repo darcs-clone >/dev/null cd darcs-clone echo c >> a echo c > c @@ -50,7 +50,7 @@ hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@" } -hg convert darcs-repo darcs-repo-hg +hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$' # The converter does not currently handle patch conflicts very well. # When they occur, it reverts *all* changes and moves forward, # letting the conflict resolving patch fix collisions.