[svk-commit] r2879 - branches/path-resolver/t/smerge/path-resolver

[nobody at bestpractical.com]

Author: ruz
Date: Tue May 13 18:45:27 2008
New Revision: 2879

Modified:
   branches/path-resolver/t/smerge/path-resolver/change_in_deleted_file_co.t

Log:
* ok, one problem has been fixed in trunk
* another came up: looks like Checkout editor doesn't understand
  add_xxx call when path is marked for deletion

Modified: branches/path-resolver/t/smerge/path-resolver/change_in_deleted_file_co.t
==============================================================================
--- branches/path-resolver/t/smerge/path-resolver/change_in_deleted_file_co.t	(original)
+++ branches/path-resolver/t/smerge/path-resolver/change_in_deleted_file_co.t	Tue May 13 18:45:27 2008
@@ -20,21 +20,33 @@
 $svk->add ("$copath/a_file");
 $svk->commit ('-m', 'init', "$copath");
 
+chdir $copath;
+
 {
-    append_file ("$copath/a_file", "a change\n");
-    $svk->commit ('-m', 'change a file', "$copath");
+    append_file ("a_file", "a change\n");
+    $svk->commit ('-m', 'change a file');
 
-    $svk->up ('-r', '-1', "$copath");
-    diag $output;
-    is_output ($svk, 'cat', ["$copath/a_file"],
+    $svk->up ('-r', '-1');
+    is_output ($svk, 'cat', ["a_file"],
         ['a file']
     );
-    die "XXX: if we uncomment this line then output is different, some sort of caching?";
-    #$svk->st ("$copath");
-    #diag $output;
-    $svk->rm ("$copath/a_file");
-    diag $output;
-    $svk->up ('-C', "$copath");
-    diag $output;
+    $svk->rm ("a_file");
+    is_output ($svk, 'up', [ '-C'],
+        ['Syncing //(/) in '.__"$corpath to 2.",
+        'C   a_file',
+        '1 conflict found.']
+    );
+
+    $answer = ['a'];
+    is_output ($svk, 'up', [ ], [
+        'Syncing //(/) in '.__"$corpath to 2.",
+        'A   a_file',
+    ] );
+    is_output ($svk, 'cat', ["a_file"],
+        ['a file', 'a change']
+    );
+    is_output ($svk, 'st', [ ],
+        [''],
+    );
 }