From 98901c4f4da8c5100280c42f65037aec1b876ebb Mon Sep 17 00:00:00 2001
From: Thomas Arendsen Hein <thomas@intevation.de>
Date: Fri, 21 Dec 2007 12:07:02 +0100
Subject: [PATCH] Fix test-convert-darcs output on Debian etch (issue779)

The CR characters of darcs get confused the output.
Additionally this darcs version printed:
darcs: <stdin>: hGetLine: end of file
---
 tests/test-convert-darcs     | 4 ++--
 tests/test-convert-darcs.out | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/test-convert-darcs b/tests/test-convert-darcs
index e708d9c634..ecc9c5abbc 100755
--- a/tests/test-convert-darcs
+++ b/tests/test-convert-darcs
@@ -26,7 +26,7 @@ darcs record -a -l -m p0
 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 @@ glog()
     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 --git a/tests/test-convert-darcs.out b/tests/test-convert-darcs.out
index 9e3831c950..ec01b45e98 100644
--- a/tests/test-convert-darcs.out
+++ b/tests/test-convert-darcs.out
@@ -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'