[svk-commit] r2268 - branches/2.0-releng/t

[nobody at bestpractical.com]

Author: clkao
Date: Sun Dec 24 12:02:12 2006
New Revision: 2268

Modified:
   branches/2.0-releng/t/07smerge-copy-co.t

Log:
Mark smerge-copy-co line ending issues in test as todo.

Modified: branches/2.0-releng/t/07smerge-copy-co.t
==============================================================================
--- branches/2.0-releng/t/07smerge-copy-co.t	(original)
+++ branches/2.0-releng/t/07smerge-copy-co.t	Sun Dec 24 12:02:12 2006
@@ -5,7 +5,6 @@
 use Cwd;
 use SVK::Test;
 
-
 my ($xd, $svk) = build_test();
 our $output;
 my ($copath, $corpath) = get_copath ('smerge-copy-co');
@@ -22,10 +21,12 @@
 	   ['Auto-merging (3, 5) /trunk to /local (base /trunk:3).',
 	    'A + A-cp',
 	    qr'New merge ticket: .*:/trunk:5']);
-
+TODO: {
+local $TODO = 'defult layers should be applied to editor::xd files added with history' if IS_WIN32;
 is_output ($svk, 'st', [],
 	   ['A + A-cp',
 	    ' M  .']);
+}
 is_output ($svk, 'ci', [-m => 'commit the smerge from checkout'],
 	   ['Committed revision 6.']);