[svk-commit] r2854 - branches/path-resolver/t

[nobody at bestpractical.com]

Author: ruz
Date: Fri May  9 21:07:17 2008
New Revision: 2854

Modified:
   branches/path-resolver/t/07smerge-rename-dest.t

Log:
* adjust according to the latest changes, it still fails, but now we test
  what we want to see in this branch

Modified: branches/path-resolver/t/07smerge-rename-dest.t
==============================================================================
--- branches/path-resolver/t/07smerge-rename-dest.t	(original)
+++ branches/path-resolver/t/07smerge-rename-dest.t	Fri May  9 21:07:17 2008
@@ -28,12 +28,13 @@
 $svk->add("$copath/A/deep/bar");
 $svk->ci(-m => 'change on trunk', $copath);
 $svk->mv('-m', 'move foo', '//local/A', '//local/A-away');
-is_output($svk, 'sm', [-m => 'merge', '//trunk', '//local'],
+is_output($svk, 'sm', ['-C', '//trunk', '//local'],
 	  ['Auto-merging (2, 4) /trunk to /local (base /trunk:2).',
-	   '    A - skipped',
-	   '    A/foo - skipped',
-	   '    A/deep/bar - skipped',
-	   'Empty merge.']);
+	   'C   A/deep/bar',
+	   'C   A/foo',
+	   'Empty merge.',
+       '2 conflicts found',
+]);
 
 is_output($svk, 'sm', ['--track-rename', -m => 'merge', '//trunk', '//local'],
 	  ['Auto-merging (2, 4) /trunk to /local (base /trunk:2).',