[svk-commit] r2272 - in branches/2.0-releng: t

[nobody at bestpractical.com]

Author: clkao
Date: Mon Dec 25 12:52:15 2006
New Revision: 2272

Modified:
   branches/2.0-releng/lib/SVK/Editor/Checkout.pm
   branches/2.0-releng/t/07smerge-copy-co.t

Log:
untodo editor::checkout related tests for win32.  always use :raw for get_fh in Editor::Checkout.

Modified: branches/2.0-releng/lib/SVK/Editor/Checkout.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Editor/Checkout.pm	(original)
+++ branches/2.0-releng/lib/SVK/Editor/Checkout.pm	Mon Dec 25 12:52:15 2006
@@ -128,7 +128,7 @@
 
 sub get_fh {
     my ($self, $path, $copath) = @_;
-    open my $fh, '>', $copath or warn "can't open $path: $!", return;
+    open my $fh, '>:raw', $copath or warn "can't open $path: $!", return;
     $self->{iod}{$path} = IO::Digest->new ($fh, 'MD5')
 	unless $self->{ignore_checksum};
     return $fh;

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	Mon Dec 25 12:52:15 2006
@@ -21,12 +21,10 @@
 	   ['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.']);