changeset 5667:f29b7c8419cb

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
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 21 Dec 2007 12:07:02 +0100
parents eae4553b2763
children ca4f10c76ea7 c08cda4e4ddd
files tests/test-convert-darcs tests/test-convert-darcs.out
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- a/tests/test-convert-darcs.out	Sun Dec 16 22:55:23 2007 +0100
+++ b/tests/test-convert-darcs.out	Fri Dec 21 12:07:02 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'