# # # patch "tests/files_with_intermediate__MTN_path_elements/__driver__.lua" # from [fbf8d22c807fdd6b80b3ab12c3d84dcf6cb3ec52] # to [a964a38aa1159ba141398e70c309866eacdf989f] # # patch "tests/listing_workspace_manifests/__driver__.lua" # from [4f7b902626cfbb1fc0725b052b28cb1cbb54829f] # to [84c0efaf39ebdb33b1b8b3b83e5c5e78ed4671ee] # # patch "tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua" # from [2e1e0ea14779fcb012dd867d674d5421c2079dbe] # to [9caec745c7278f1c91d55ffc5261b724c6a9c063] # # patch "tests/merge_rename_file_and_rename_dir/__driver__.lua" # from [58481ed4e470ac7efa3a5956c5bd14be8ce687d9] # to [d70a9ff66618082f0941927ed79a09be99565fc1] # # patch "tests/rename_in_subdir/__driver__.lua" # from [45714670530104d697fc2ab8caf3f1f939ed6886] # to [c7e95641f60f08909952598f3a668e19a00b0e91] # ============================================================ --- tests/files_with_intermediate__MTN_path_elements/__driver__.lua fbf8d22c807fdd6b80b3ab12c3d84dcf6cb3ec52 +++ tests/files_with_intermediate__MTN_path_elements/__driver__.lua a964a38aa1159ba141398e70c309866eacdf989f @@ -28,13 +28,12 @@ check(samefile("dir3/_MTN", "outdir1/dir -- renames +check(mtn("rename", "dir1/_MTN/testfile1", "dir1/_MTN/testfile1x"), 0, false, false) +check(mtn("rename", "dir2/_MTN", "dir2/TM"), 0, false, false) +check(mtn("rename", "dir3", "dir3x"), 0, false, false) rename("dir1/_MTN/testfile1", "dir1/_MTN/testfile1x") rename("dir2/_MTN", "dir2/TM") rename("dir3", "dir3x") - -check(mtn("rename", "dir1/_MTN/testfile1", "dir1/_MTN/testfile1x"), 0, false, false) -check(mtn("rename", "dir2/_MTN", "dir2/TM"), 0, false, false) -check(mtn("rename", "dir3", "dir3x"), 0, false, false) commit() check(mtn("checkout", "outdir2"), 0, false, false) ============================================================ --- tests/listing_workspace_manifests/__driver__.lua 4f7b902626cfbb1fc0725b052b28cb1cbb54829f +++ tests/listing_workspace_manifests/__driver__.lua 84c0efaf39ebdb33b1b8b3b83e5c5e78ed4671ee @@ -24,10 +24,10 @@ check(mtn("drop", "foo"), 0, false, fals check(sort("stdout"), 0, "bar\ndir\ndir/bar\ndir/foo\nfoo\n") check(mtn("drop", "foo"), 0, false, false) +check(mtn("rename", "dir", "dir2"), 0, false, false) rename("dir", "dir2") -check(mtn("rename", "dir", "dir2"), 0, false, false) +check(mtn("rename", "bar", "baz"), 0, false, false) rename("bar", "baz") -check(mtn("rename", "bar", "baz"), 0, false, false) check(mtn("ls", "known"), 0, true) check(sort("stdout"), 0, "baz\ndir2\ndir2/bar\ndir2/foo\n") ============================================================ --- tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua 2e1e0ea14779fcb012dd867d674d5421c2079dbe +++ tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua 9caec745c7278f1c91d55ffc5261b724c6a9c063 @@ -6,8 +6,8 @@ base = base_revision() commit() base = base_revision() +check(mtn("rename", "foo", "bar"), 0, false, false) rename("foo", "bar") -check(mtn("rename", "foo", "bar"), 0, false, false) commit() remove("bar") ============================================================ --- tests/merge_rename_file_and_rename_dir/__driver__.lua 58481ed4e470ac7efa3a5956c5bd14be8ce687d9 +++ tests/merge_rename_file_and_rename_dir/__driver__.lua d70a9ff66618082f0941927ed79a09be99565fc1 @@ -12,8 +12,8 @@ base = base_revision() -- rename directory +check(mtn("rename", "foo", "foof"), 0, false, false) rename("foo", "foof") -check(mtn("rename", "foo", "foof"), 0, false, false) commit() -- rename file in directory ============================================================ --- tests/rename_in_subdir/__driver__.lua 45714670530104d697fc2ab8caf3f1f939ed6886 +++ tests/rename_in_subdir/__driver__.lua c7e95641f60f08909952598f3a668e19a00b0e91 @@ -11,8 +11,8 @@ check(indir("subdir", mtn("rename", "foo rename("subdir/foo", "subdir/foo-renamed") check(indir("subdir", mtn("rename", "foo", "foo-renamed")), 0, false, false) +check(indir("subdir", mtn("rename", "anotherdir", "../anotherdir-renamed")), 0, false, false) rename("subdir/anotherdir", "anotherdir-renamed") -check(indir("subdir", mtn("rename", "anotherdir", "../anotherdir-renamed")), 0, false, false) commit() check(mtn("checkout", "--revision", rev, "codir"), 0, false, false)