Skip to content

Commit cc08e7b

Browse files
committed
remove merge_folders
1 parent e7eb0fe commit cc08e7b

File tree

4 files changed

+0
-327
lines changed

4 files changed

+0
-327
lines changed

library/__main__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
},
4545
"Folder subcommands": {
4646
"merge_mv": "Move files and merge folders in BSD/rsync style, rename if possible",
47-
"merge_folders": "Merge two or more file trees, check for conflicts before merging",
4847
"mergerfs_cp": "cp files with reflink on mergerfs",
4948
"scatter": "Scatter files between folders or disks",
5049
"mv_list": "Find specific folders to move to different disks",
@@ -199,7 +198,6 @@ def print_help(parser) -> None:
199198
"library.files.sample_hash.sample_hash": ["hash", "hash-file"],
200199
"library.files.similar_files.similar_files": [],
201200
"library.files.llm_map.llm_map": [],
202-
"library.folders.merge_folders.merge_folders": ["merge-folder"],
203201
"library.folders.move_list.move_list": ["mv-list"],
204202
"library.folders.merge_mv.merge_mv": ["mv"],
205203
"library.folders.merge_mv.merge_cp": ["cp"],

library/folders/merge_folders.py

Lines changed: 0 additions & 208 deletions
This file was deleted.

library/usage.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -904,16 +904,6 @@ def play(action) -> str:
904904
library merge-dbs --pk path big.db specific-site.db -v --only-new-rows -t media,playlists -w 'path like "https://specific-site%"'
905905
"""
906906

907-
merge_folders = """library merge-folders [--replace] [--no-replace] [--simulate] SOURCES ... DESTINATION
908-
909-
Merge multiple folders with the same file tree into a single folder.
910-
911-
https://github.com/chapmanjacobd/journal/blob/main/programming/linux/misconceptions.md#mv-src-vs-mv-src
912-
913-
Trumps are new or replaced files from an earlier source which now conflict with a later source.
914-
If you only have one source then the count of trumps will always be zero.
915-
The count of conflicts also includes trumps.
916-
"""
917907

918908
merge_online_local = """library merge-online-local DATABASE
919909

tests/folders/test_merge_folders.py

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)