[svk-commit] r2699 - trunk/t

[nobody at bestpractical.com]

Author: clsung
Date: Sun Feb 17 09:10:23 2008
New Revision: 2699

Modified:
   trunk/t/07smerge-bidi-inc.t
   trunk/t/36push-pull.t

Log:
- to pass in both svn 1.4/1.5

Modified: trunk/t/07smerge-bidi-inc.t
==============================================================================
--- trunk/t/07smerge-bidi-inc.t	(original)
+++ trunk/t/07smerge-bidi-inc.t	Sun Feb 17 09:10:23 2008
@@ -115,7 +115,7 @@
         "Auto-merging (10, 12) /l to /m (base /l:10).",
         "===> Auto-merging (10, 12) /l to /m (base /l:10).",
         "Merging back to mirror source $uri/A.",
-	qr"Transaction is out of date: Out of date: '/A' in transaction '.*'",
+	qr"Transaction is out of date: .+ '/A' .+",
 	 'Please sync mirrored path /m first.']);
 
 $svk->sync('//m');

Modified: trunk/t/36push-pull.t
==============================================================================
--- trunk/t/36push-pull.t	(original)
+++ trunk/t/36push-pull.t	Sun Feb 17 09:10:23 2008
@@ -202,7 +202,7 @@
 	   ['Auto-merging (0, 25) /l2 to /m (base /m:16).',
 	    '===> Auto-merging (0, 18) /l2 to /m (base /m:16).',
 	    "Merging back to mirror source $uri/A.",
-	    qr"Transaction is out of date: Out of date: '/A' in transaction '.*'",
+	    qr"Transaction is out of date: .+ '/A' .+",
 	    'Please sync mirrored path /m first.']);
 
 # syncing
@@ -253,7 +253,7 @@
 	  ['Auto-merging (0, 29) /l2 to /m (base /m:27).',
 	   '===> Auto-merging (0, 18) /l2 to /m (base /m:16).',
 	   "Merging back to mirror source $uri/A.",
-	    qr"Transaction is out of date: Out of date: '/A' in transaction '.*'",
+	    qr"Transaction is out of date: .+ '/A' .+",
 	    'Please sync mirrored path /m first.']);
 # syncing
 $svk->sync('//m');