# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1198235675 -3600
# Node ID c08cda4e4dddd3284b3a1053ba0e59cd6b503bbd
# Parent  396c7010b0cdd1dd8c3d3578dd2d1a1cf5af42fe# Parent  f29b7c8419cb4d62f297fae9c4190d75801d9802
merge with crew-stable

diff -r 396c7010b0cd -r c08cda4e4ddd tests/test-convert-darcs
--- a/tests/test-convert-darcs	Fri Dec 21 10:24:03 2007 +0100
+++ b/tests/test-convert-darcs	Fri Dec 21 12:14:35 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.
diff -r 396c7010b0cd -r c08cda4e4ddd tests/test-convert-darcs.out
--- a/tests/test-convert-darcs.out	Fri Dec 21 10:24:03 2007 +0100
+++ b/tests/test-convert-darcs.out	Fri Dec 21 12:14:35 2007 +0100
@@ -1,8 +1,6 @@
 % initialize darcs repo
 Finished recording patch 'p0'
 % branch and update
-
Copying patch 1 of 1...
Copying patch 1 of 1... done.
-Finished getting.
 Finished recording patch 'p1.1'
 % update source
 Finished recording patch 'p1.2'