# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1265741387 21600
# Node ID caaa1f99d681b97e2296eb7a03edd63c77e5b02d
# Parent  600142e7a0280df78ca5112b8f730b9af1b8bcd8
test-subrepo-svn: handle svn output changes gracefully

diff -r 600142e7a028 -r caaa1f99d681 tests/test-subrepo-svn
--- a/tests/test-subrepo-svn	Mon Feb 08 08:18:49 2010 -0600
+++ b/tests/test-subrepo-svn	Tue Feb 09 12:49:47 2010 -0600
@@ -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