[svk-commit] r2458 - branches/i18n-fixes/t/i18n
nobody at bestpractical.com
nobody at bestpractical.com
Mon Jul 16 05:39:44 EDT 2007
Author: clkao
Date: Mon Jul 16 05:39:34 2007
New Revision: 2458
Modified:
branches/i18n-fixes/t/i18n/checkout.t
Log:
quiet the test.
Modified: branches/i18n-fixes/t/i18n/checkout.t
==============================================================================
--- branches/i18n-fixes/t/i18n/checkout.t (original)
+++ branches/i18n-fixes/t/i18n/checkout.t Mon Jul 16 05:39:34 2007
@@ -55,7 +55,6 @@
overwrite_file (copath("$file"),
"hihi\n");
$svk->update ($copath); # XXX use is_ouptut to compare conflict diff header
-warn $output;
ok ($output =~ m/1 conflict found\./, 'conflict');
$svk->update ('-r', 1, $copath);
@@ -65,5 +64,4 @@
$ENV{SVKRESOLVE} = "";
our $answer = [ 'd', 'y' ];
$svk->update ($copath); # XXX use is_ouptut to compare conflict diff header
-warn $output;
ok ($output =~ m#G t/checkout/filenames/$file#, 'diff');
More information about the svk-commit
mailing list