Mercurial > hg

comparison tests/test-subrepo-svn @ 10423:caaa1f99d681

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepo-svn: handle svn output changes gracefully
author Augie Fackler <durin42@gmail.com>
date Tue, 09 Feb 2010 12:49:47 -0600
parents e898bc7810ad
children 4f38d03d4975
comparison
equal deleted inserted replaced
10422:600142e7a028 10423:caaa1f99d681
13 expr $escapedwd : "\/" > /dev/null 13 expr $escapedwd : "\/" > /dev/null
14 if [ $? -ne 0 ]; then 14 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
21 SVNREPO="file://$escapedwd/svn-repo" 22 SVNREPO="file://$escapedwd/svn-repo"
22 WCROOT="`pwd`/svn-wc" 23 WCROOT="`pwd`/svn-wc"
77 svn ci -m 'amend a from svn' 78 svn ci -m 'amend a from svn'
78 cd ../../sub/t 79 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
91 echo zzz > s/externals/other 92 echo zzz > s/externals/other
92 hg ci -m 'amend externals from hg' 93 hg ci -m 'amend externals from hg'