improve data-regression readability

chapmanjacobd · Oct 20, 2024 · f37e61c · f37e61c
1 parent 4bd5cfa
commit f37e61c
Show file tree

Hide file tree

Showing 199 changed files with 285 additions and 248 deletions.
diff --git a/tests/folders/test_merge_mv.py b/tests/folders/test_merge_mv.py
@@ -172,7 +172,13 @@ def test_merge(assert_unchanged, src_type, dest_type, dest_opt, file_over_file_m
         {
             "src1_before": src1_before,
             "dest_before": dest_before,
-            "command": " ".join([*cmd, f"src1:{src_type}", f"dest:{dest_type}"]),
+            "command": " ".join(
+                [
+                    *cmd,
+                    f"{src1_arg.replace(src1, "/src1")}:{src_type}",
+                    f"{dest_arg.replace(dest, "/dest")}:{dest_type}",
+                ]
+            ),
             "src1_after": src1_after,
             "dest_after": dest_after,
         }

diff --git a/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=bsd].yml b/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-bsd src1:bsd dest:clobber_file
+command: merge-mv --file-over-file delete-dest --bsd --dest-bsd /src1:bsd /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '4'

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=file].yml b/...ge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:file dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/file4.txt:file /dest/file4.txt:clobber_file
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=folder].yml b/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:folder dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/:folder /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '5'

diff --git a/...le_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml b/...le_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:not_exist dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1:not_exist /dest/file4.txt:clobber_file
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=parent].yml b/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_file src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-bsd src1:parent dest:clobber_file
+command: merge-mv --file-over-file delete-dest --parent --dest-bsd /src1/file4.txt:parent
+  /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '4'

diff --git a/...e[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml b/...e[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-bsd src1:bsd dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --bsd --dest-bsd /src1:bsd /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=file].yml b/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:file dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/file4.txt:file /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...ile_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=folder].yml b/...ile_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:folder dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/:folder /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/..._over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml b/..._over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:not_exist dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1:not_exist /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...ile_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=parent].yml b/...ile_over_file_mode=delete_dest dest_opt=bsd dest_type=clobber_folder src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-bsd src1:parent dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --parent --dest-bsd /src1/file4.txt:parent
+  /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=bsd].yml b/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-bsd src1:bsd dest:folder_merge
+command: merge-mv --file-over-file delete-dest --bsd --dest-bsd /src1:bsd /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=file].yml b/...ge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:file dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/file4.txt:file /dest:folder_merge
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=folder].yml b/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:folder dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/:folder /dest:folder_merge
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml b/...le_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:not_exist dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1:not_exist /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=parent].yml b/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=folder_merge src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-bsd src1:parent dest:folder_merge
+command: merge-mv --file-over-file delete-dest --parent --dest-bsd /src1/file4.txt:parent
+  /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/..._merge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=bsd].yml b/..._merge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-bsd src1:bsd dest:not_exist
+command: merge-mv --file-over-file delete-dest --bsd --dest-bsd /src1:bsd /dest:not_exist
 dest_after:
   src1:
     file4.txt: '5'

diff --git a/...merge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=file].yml b/...merge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:file dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/file4.txt:file /dest:not_exist
 dest_after:
   file4.txt: '5'
 dest_before: {}

diff --git a/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=folder].yml b/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:folder dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1/:folder /dest:not_exist
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=not_exist].yml b/...[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-bsd src1:not_exist dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-bsd /src1:not_exist /dest:not_exist
 dest_after: {}
 dest_before: {}
 src1_after: {}

diff --git a/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=parent].yml b/...rge[file_over_file_mode=delete_dest dest_opt=bsd dest_type=not_exist src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-bsd src1:parent dest:not_exist
+command: merge-mv --file-over-file delete-dest --parent --dest-bsd /src1/file4.txt:parent
+  /dest:not_exist
 dest_after:
   src1:
     file4.txt: '5'

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=bsd].yml b/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-file src1:bsd dest:clobber_file
+command: merge-mv --file-over-file delete-dest --bsd --dest-file /src1:bsd /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '4'

diff --git a/...e[file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=file].yml b/...e[file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:file dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-file /src1/file4.txt:file /dest/file4.txt:clobber_file
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=folder].yml b/...file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:folder dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-file /src1/:folder /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '5'

diff --git a/...e_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=not_exist].yml b/...e_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:not_exist dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-file /src1:not_exist /dest/file4.txt:clobber_file
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=parent].yml b/...file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_file src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-file src1:parent dest:clobber_file
+command: merge-mv --file-over-file delete-dest --parent --dest-file /src1/file4.txt:parent
+  /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '4'

diff --git a/...[file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=bsd].yml b/...[file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-file src1:bsd dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --bsd --dest-file /src1:bsd /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=file].yml b/...file_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:file dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-file /src1/file4.txt:file /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=folder].yml b/...le_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:folder dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-file /src1/:folder /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=not_exist].yml b/...over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:not_exist dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-file /src1:not_exist /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=parent].yml b/...le_over_file_mode=delete_dest dest_opt=file dest_type=clobber_folder src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-file src1:parent dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --parent --dest-file /src1/file4.txt:parent
+  /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=bsd].yml b/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-file src1:bsd dest:folder_merge
+command: merge-mv --file-over-file delete-dest --bsd --dest-file /src1:bsd /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...e[file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=file].yml b/...e[file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:file dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-file /src1/file4.txt:file /dest:folder_merge
 dest_after:
   dest: '5'
   file4.txt: '4'

diff --git a/...file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=folder].yml b/...file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:folder dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-file /src1/:folder /dest:folder_merge
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...e_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=not_exist].yml b/...e_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:not_exist dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-file /src1:not_exist /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=parent].yml b/...file_over_file_mode=delete_dest dest_opt=file dest_type=folder_merge src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-file src1:parent dest:folder_merge
+command: merge-mv --file-over-file delete-dest --parent --dest-file /src1/file4.txt:parent
+  /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...merge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=bsd].yml b/...merge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-file src1:bsd dest:not_exist
+command: merge-mv --file-over-file delete-dest --bsd --dest-file /src1:bsd /dest:not_exist
 dest_after:
   src1:
     file4.txt: '5'

diff --git a/...erge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=file].yml b/...erge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=file].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:file dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-file /src1/file4.txt:file /dest:not_exist
 dest_after:
   dest: '5'
 dest_before: {}

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=folder].yml b/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:folder dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-file /src1/:folder /dest:not_exist
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=not_exist].yml b/...file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-file src1:not_exist dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-file /src1:not_exist /dest:not_exist
 dest_after: {}
 dest_before: {}
 src1_after: {}

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=parent].yml b/...ge[file_over_file_mode=delete_dest dest_opt=file dest_type=not_exist src_type=parent].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-file src1:parent dest:not_exist
+command: merge-mv --file-over-file delete-dest --parent --dest-file /src1/file4.txt:parent
+  /dest:not_exist
 dest_after:
   src1: '5'
 dest_before: {}

diff --git a/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=bsd].yml b/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-folder src1:bsd dest:clobber_file
+command: merge-mv --file-over-file delete-dest --bsd --dest-folder /src1:bsd /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '4'

diff --git a/...file_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=file].yml b/...file_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=file].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:file dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/file4.txt:file
+  /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '5'

diff --git a/...le_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=folder].yml b/...le_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:folder dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/:folder /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '5'

diff --git a/...over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=not_exist].yml b/...over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:not_exist dest:clobber_file
+command: merge-mv --file-over-file delete-dest --dest-folder /src1:not_exist /dest/file4.txt:clobber_file
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=parent].yml b/...le_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_file src_type=parent].yml
@@ -1,5 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-folder src1:parent
-  dest:clobber_file
+command: merge-mv --file-over-file delete-dest --parent --dest-folder /src1/file4.txt:parent
+  /dest/file4.txt:clobber_file
 dest_after:
   file4.txt:
     file4.txt: '4'

diff --git a/...ile_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=bsd].yml b/...ile_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-folder src1:bsd dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --bsd --dest-folder /src1:bsd /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=file].yml b/...le_over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=file].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:file dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/file4.txt:file
+  /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/..._over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=folder].yml b/..._over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:folder dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/:folder /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...er_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml b/...er_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:not_exist dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --dest-folder /src1:not_exist /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/..._over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=parent].yml b/..._over_file_mode=delete_dest dest_opt=folder dest_type=clobber_folder src_type=parent].yml
@@ -1,5 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-folder src1:parent
-  dest:clobber_folder
+command: merge-mv --file-over-file delete-dest --parent --dest-folder /src1/file4.txt:parent
+  /dest/folder1:clobber_folder
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=bsd].yml b/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-folder src1:bsd dest:folder_merge
+command: merge-mv --file-over-file delete-dest --bsd --dest-folder /src1:bsd /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...file_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=file].yml b/...file_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=file].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:file dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/file4.txt:file
+  /dest:folder_merge
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=folder].yml b/...le_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:folder dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/:folder /dest:folder_merge
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=not_exist].yml b/...over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:not_exist dest:folder_merge
+command: merge-mv --file-over-file delete-dest --dest-folder /src1:not_exist /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=parent].yml b/...le_over_file_mode=delete_dest dest_opt=folder dest_type=folder_merge src_type=parent].yml
@@ -1,5 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-folder src1:parent
-  dest:folder_merge
+command: merge-mv --file-over-file delete-dest --parent --dest-folder /src1/file4.txt:parent
+  /dest:folder_merge
 dest_after:
   file4.txt: '4'
   folder1:

diff --git a/...rge[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=bsd].yml b/...rge[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=bsd].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --bsd --dest-folder src1:bsd dest:not_exist
+command: merge-mv --file-over-file delete-dest --bsd --dest-folder /src1:bsd /dest:not_exist
 dest_after:
   src1:
     file4.txt: '5'

diff --git a/...ge[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=file].yml b/...ge[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=file].yml
@@ -1,4 +1,5 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:file dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/file4.txt:file
+  /dest:not_exist
 dest_after:
   file4.txt: '5'
 dest_before: {}

diff --git a/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=folder].yml b/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=folder].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:folder dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-folder /src1/:folder /dest:not_exist
 dest_after:
   file4.txt: '5'
   folder1:

diff --git a/...le_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=not_exist].yml b/...le_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=not_exist].yml
@@ -1,4 +1,4 @@
-command: merge-mv --file-over-file delete-dest --dest-folder src1:not_exist dest:not_exist
+command: merge-mv --file-over-file delete-dest --dest-folder /src1:not_exist /dest:not_exist
 dest_after: {}
 dest_before: {}
 src1_after: {}

diff --git a/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=parent].yml b/...[file_over_file_mode=delete_dest dest_opt=folder dest_type=not_exist src_type=parent].yml
@@ -1,5 +1,5 @@
-command: merge-mv --file-over-file delete-dest --parent --dest-folder src1:parent
-  dest:not_exist
+command: merge-mv --file-over-file delete-dest --parent --dest-folder /src1/file4.txt:parent
+  /dest:not_exist
 dest_after:
   src1:
     file4.txt: '5'