[svk-commit] r2260 - branches/2.0-releng/t
nobody at bestpractical.com
nobody at bestpractical.com
Sun Dec 24 09:29:00 EST 2006
Author: clkao
Date: Sun Dec 24 09:28:59 2006
New Revision: 2260
Modified:
branches/2.0-releng/t/22status-conflict.t
branches/2.0-releng/t/24diff.t
Log:
mark sep issues in 24diff as todo for win32.
Modified: branches/2.0-releng/t/22status-conflict.t
==============================================================================
--- branches/2.0-releng/t/22status-conflict.t (original)
+++ branches/2.0-releng/t/22status-conflict.t Sun Dec 24 09:28:59 2006
@@ -29,7 +29,7 @@
is_output($svk, 'st', [],
['C A',
- 'C A/something']);
+ __('C A/something')]);
is_output($svk, 'up', [],
['Syncing //(/) in '.__($corpath).' to 1.',
Modified: branches/2.0-releng/t/24diff.t
==============================================================================
--- branches/2.0-releng/t/24diff.t (original)
+++ branches/2.0-releng/t/24diff.t Sun Dec 24 09:28:59 2006
@@ -374,10 +374,12 @@
$svk->cp ('-m', 'blah', '//B', '//A/B-cp');
$svk->cp ('//A', 'C');
append_file ("C/foo", "copied and modified on C\n");
+TODO: {
+local $TODO = 'path sep issues on win32' if IS_WIN32;
is_output($svk, 'diff', ['C'],
- [__("=== C\t(new directory; copied from /A\@5)"),
+ [__("=== C\t(new directory; copied from ").'/A at 5)',
'==================================================================',
- __("=== C/foo\t(copied from /A/foo\@5)"),
+ __("=== C/foo\t(copied from ").'/A/foo at 5)',
'==================================================================',
__("--- C/foo\t(revision 4)"),
__("+++ C/foo\t(local)"),
@@ -479,7 +481,7 @@
'+newline',
'+fnord',
'+copied and modified on C']);
-
+}
$svk->revert ('-R', '.');
$svk->resolved ('-R', '.');
$svk->update;
More information about the svk-commit
mailing list