##// END OF EJS Templates
test-subrepo-svn: handle svn output changes gracefully
Augie Fackler -
r10423:caaa1f99 default
parent child Browse files
Show More
@@ -15,6 +15,7 if [ $? -ne 0 ]; then
15 escapedwd='/'$escapedwd
15 escapedwd='/'$escapedwd
16 fi
16 fi
17 filterpath="sed s|$escapedwd|/root|"
17 filterpath="sed s|$escapedwd|/root|"
18 filtersvn='s/ in transaction.*/ is out of date/;s/Out of date: /File /'
18
19
19 echo % create subversion repo
20 echo % create subversion repo
20
21
@@ -79,12 +80,12 cd ../../sub/t
79
80
80 echo % this commit from hg will fail
81 echo % this commit from hg will fail
81 echo zzz >> s/alpha
82 echo zzz >> s/alpha
82 hg ci -m 'amend alpha from hg'
83 hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
83 svn revert -q s/alpha
84 svn revert -q s/alpha
84
85
85 echo % this commit fails because of meta changes
86 echo % this commit fails because of meta changes
86 svn propset svn:mime-type 'text/html' s/alpha
87 svn propset svn:mime-type 'text/html' s/alpha
87 hg ci -m 'amend alpha from hg'
88 hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
88 svn revert -q s/alpha
89 svn revert -q s/alpha
89
90
90 echo % this commit fails because of externals changes
91 echo % this commit fails because of externals changes
General Comments 0
You need to be logged in to leave comments. Login now