Mercurial > hg

changeset 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 600142e7a028
children 93b5abcf5101
files tests/test-subrepo-svn
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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