[svk-commit] r2389 - trunk/t

[nobody at bestpractical.com]

Author: clkao
Date: Sat May  5 02:41:18 2007
New Revision: 2389

Modified:
   trunk/t/07smerge-rename3.t

Log:
All tests pass now for smerge-rename3.

Modified: trunk/t/07smerge-rename3.t
==============================================================================
--- trunk/t/07smerge-rename3.t	(original)
+++ trunk/t/07smerge-rename3.t	Sat May  5 02:41:18 2007
@@ -98,10 +98,6 @@
 $svk->update();
 is_file_content('module2/test.txt', '34');
 
-TODO: {
-todo_skip 'not working', 4;
-
-
 # adding a new dir on trunk
 $svk->mkdir('foo');
 overwrite_file('foo/test.txt', 'a');
@@ -110,12 +106,12 @@
 
 # Merge changes w/rename from trunk to branch
 is_output ($svk, 'smerge', ['//trunk', '//branches/newbranch', '--track-rename', '-m', 'merge 3'], [
-    'Auto-merging (6, 10) /trunk to /branches/newbranch (base /trunk:6).',
+    'Auto-merging (8, 12) /trunk to /branches/newbranch (base /branches/newbranch:10).',
     'Collecting renames, this might take a while.',
     'A   foo',
     'A   foo/test.txt',
-    "New merge ticket: $uuid:/trunk:10",
-    'Committed revision 11.',
+    "New merge ticket: $uuid:/trunk:12",
+    'Committed revision 13.',
 ]);
 
 chdir($co_branch_path);
@@ -127,16 +123,16 @@
 $svk->ci(-m => "test 6 - renamed and changed");
 
 is_output ($svk, 'smerge', ['//branches/newbranch', '//trunk', '--track-rename', '-m', 'merge back'], [
-    'Auto-merging (0, 12) /branches/newbranch to /trunk (base /trunk:10).',
+    'Auto-merging (10, 14) /branches/newbranch to /trunk (base /trunk:12).',
     'Collecting renames, this might take a while.',
-    'A   bar',
-    'A   bar/test.txt',
+    'A + bar',
+    'U   bar/test.txt',
     'D   foo',
-    "New merge ticket: $uuid:/trunk:10",
-    'Committed revision 13.',
+    "New merge ticket: $uuid:/branches/newbranch:14",
+    'Committed revision 15.',
 ]);
 
 chdir($co_trunk_path);
 $svk->update();
 is_file_content('bar/test.txt', 'b');
-}
+