[svk-commit] r2557 - branches/ticket-bug/t

[nobody at bestpractical.com]

Author: clsung
Date: Sun Oct 21 22:31:14 2007
New Revision: 2557

Modified:
   branches/ticket-bug/t/07smerge-bidi-inc.t

Log:
- workaround before we implement 
  - less strict mode on server side

Modified: branches/ticket-bug/t/07smerge-bidi-inc.t
==============================================================================
--- branches/ticket-bug/t/07smerge-bidi-inc.t	(original)
+++ branches/ticket-bug/t/07smerge-bidi-inc.t	Sun Oct 21 22:31:14 2007
@@ -5,7 +5,7 @@
 use File::Path;
 
 use SVK::Test;
-plan tests => 6;
+plan tests => 7;
 
 # These tests actually use push and pull, in the hope that I'll get less
 # confused. This should be okay, because other tests demonstrate that
@@ -110,6 +110,16 @@
 $svk->commit ('-m', 'more changes in remote depot', "$corpath_test");
 chdir ($corpath_default);
 
+# server should be less strict
+is_output ($svk, 'push', [], [
+        "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 '.*'",
+	 'Please sync mirrored path /m first.']);
+
+$svk->sync('//m');
+
 is_output ($svk, 'push', [], [
         "Auto-merging (10, 12) /l to /m (base /l:10).",
         "===> Auto-merging (10, 12) /l to /m (base /l:10).",
@@ -118,9 +128,7 @@
         "New merge ticket: $default_uuid:/l:12",
         "Merge back committed as revision 8.",
         "Syncing $uri/A",
-        "Retrieving log information from 6 to 8",
-        "Committed revision 13 from revision 6.",
-        "Committed revision 14 from revision 7.",
+        "Retrieving log information from 8 to 8",
         "Committed revision 15 from revision 8."]);
 
 append_file ("$corpath_default/be", "and more content\n");