[PATCH] test-subrepo-svn: handle svn output changes gracefully
Augie Fackler
durin42 at gmail.com
Fri Feb 12 08:09:29 CST 2010
# HG changeset patch
# User Augie Fackler <durin42 at gmail.com>
# Date 1265741387 21600
# Node ID 9cdc2f591fab69569ebef8fdd6b3cfda84b9141c
# Parent a638d0a08f076428d606be9ad5c28a0c5da20961
test-subrepo-svn: handle svn output changes gracefully
diff --git a/tests/test-subrepo-svn b/tests/test-subrepo-svn
--- a/tests/test-subrepo-svn
+++ b/tests/test-subrepo-svn
@@ -15,6 +15,7 @@
escapedwd='/'$escapedwd
fi
filterpath="sed s|$escapedwd|/root|"
+filtersvn='s/ in transaction.*/ is out of date/;s/Out of date: /File /'
echo % create subversion repo
@@ -79,12 +80,12 @@
echo % this commit from hg will fail
echo zzz >> s/alpha
-hg ci -m 'amend alpha from hg'
+hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
svn revert -q s/alpha
echo % this commit fails because of meta changes
svn propset svn:mime-type 'text/html' s/alpha
-hg ci -m 'amend alpha from hg'
+hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
svn revert -q s/alpha
echo % this commit fails because of externals changes
More information about the Mercurial-devel
mailing list