comparison tests/test-subrepo-svn.t @ 28533:dfd5a6830ea7

tests: make tests for convert with svn portable svn 1.6.x (at least, 1.6.12 or 1.6.17) might display empty lines, even though svn 1.9.x (at least, 1.9.3) doesn't. To make tests for convert with svn portable, this patch adds "|(^$)" regexp to egrep in filter_svn_output. To avoid similar future issue, this patch adds "|(^$)" regexp to all filter_svn_output (and adjusts test-subrepo-svn.t), even though only test-convert-svn-source.t fails with svn 1.6.x, AFAIK.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 15 Mar 2016 00:14:53 +0900
parents 048e41e9a6ac
children a145161debed
comparison
equal deleted inserted replaced
28532:ed75909c4c67 28533:dfd5a6830ea7
6 #else 6 #else
7 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"` 7 $ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
8 #endif 8 #endif
9 9
10 $ filter_svn_output () { 10 $ filter_svn_output () {
11 > egrep -v 'Committing|Transmitting|Updating' || true 11 > egrep -v 'Committing|Transmitting|Updating|(^$)' || true
12 > } 12 > }
13 13
14 create subversion repo 14 create subversion repo
15 15
16 $ WCROOT="`pwd`/svn-wc" 16 $ WCROOT="`pwd`/svn-wc"
95 phases: 2 draft 95 phases: 2 draft
96 $ hg commit --subrepos -m 'Message!' | filter_svn_output 96 $ hg commit --subrepos -m 'Message!' | filter_svn_output
97 committing subrepository s 97 committing subrepository s
98 Sending*s/alpha (glob) 98 Sending*s/alpha (glob)
99 Committed revision 3. 99 Committed revision 3.
100
101 Fetching external item into '*s/externals'* (glob) 100 Fetching external item into '*s/externals'* (glob)
102 External at revision 1. 101 External at revision 1.
103
104 At revision 3. 102 At revision 3.
105 $ hg debugsub 103 $ hg debugsub
106 path s 104 path s
107 source file://*/svn-repo/src (glob) 105 source file://*/svn-repo/src (glob)
108 revision 3 106 revision 3