[PATCH 2 of 2] tests: svn output may or may not include blank lines

danek.duvall at oracle.com danek.duvall at oracle.com
Tue Mar 15 17:02:44 EDT 2016


# HG changeset patch
# User Danek Duvall <danek.duvall at oracle.com>
# Date 1458075645 25200
#      Tue Mar 15 14:00:45 2016 -0700
# Node ID 99c113c701ef57c5b3165f35071bbb5517372683
# Parent  0bb0e0813edcb4cdda18c5d950fd0df8d90b119f
tests: svn output may or may not include blank lines

Older versions of subversion include some blank lines in the output of the
import and copy subcommands, which have gone away in newer versions.  Allow
for both by enhancing the output filter to remove blank lines.

diff --git a/tests/test-convert-hg-svn.t b/tests/test-convert-hg-svn.t
--- a/tests/test-convert-hg-svn.t
+++ b/tests/test-convert-hg-svn.t
@@ -1,7 +1,7 @@
 #require svn svn-bindings
 
   $ filter_svn_output () {
-  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
+  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' -e '/^$/d' || true
   > }
 
   $ cat <<EOF >> $HGRCPATH
diff --git a/tests/test-convert-svn-source.t b/tests/test-convert-svn-source.t
--- a/tests/test-convert-svn-source.t
+++ b/tests/test-convert-svn-source.t
@@ -1,7 +1,7 @@
 #require svn svn-bindings
 
   $ filter_svn_output () {
-  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' || true
+  >     egrep -v 'Committing|Updating' | sed -e 's/done$//' -e '/^$/d' || true
   > }
 
   $ cat >> $HGRCPATH <<EOF


More information about the Mercurial-devel mailing list