From 1a9b2cbe6c422628b1dfd3baef5d9c6a8861dae8 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 9 Jul 2023 19:54:50 +1000 Subject: [PATCH] disable Backup for WinMerge --- docs/diff-tool.md | 6 +++--- docs/winmerge-backup-directory.png | Bin 24283 -> 0 bytes docs/winmerge-no-backup.png | Bin 23751 -> 0 bytes src/DiffEngine.Tests/diffTools.include.md | 6 +++--- src/DiffEngine/Implementation/WinMerge.cs | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 docs/winmerge-backup-directory.png delete mode 100644 docs/winmerge-no-backup.png diff --git a/docs/diff-tool.md b/docs/diff-tool.md index 6dc9fedb..17a94d5f 100644 --- a/docs/diff-tool.md +++ b/docs/diff-tool.md @@ -603,17 +603,17 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a #### Notes: - * Ensure that file backups are either [disabled](winmerge-no-backup.png) or changed to use a [Global backup folder](winmerge-backup-directory.png). * [Command line reference](https://manual.winmerge.org/en/Command_line.html). * `/u` Prevents WinMerge from adding paths to the Most Recently Used (MRU) list. * `/wl` Opens the left side as read-only. * `/dl` and `/dr` Specifies file descriptions in the title bar. * `/e` Enables close with a single Esc key press. + * `/cfg Backup/EnableFile=0` disable backup files. #### Windows settings: - * Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" ` - * Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" ` + * Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" /cfg Backup/EnableFile=0 ` + * Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" /cfg Backup/EnableFile=0 ` * Scanned paths: * `%PATH%WinMergeU.exe` * `%ProgramFiles%\WinMerge\WinMergeU.exe` diff --git a/docs/winmerge-backup-directory.png b/docs/winmerge-backup-directory.png deleted file mode 100644 index 5189483264003841057fedb2ccc4ece68142c4d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24283 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 diff --git a/docs/winmerge-no-backup.png b/docs/winmerge-no-backup.png deleted file mode 100644 index bc68f1c762cc569a0b832c98847c8dbe23eddccb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23751 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

7{p_YuzNAlESS)>i%ry3COjmEk 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 diff --git a/src/DiffEngine.Tests/diffTools.include.md b/src/DiffEngine.Tests/diffTools.include.md index 14acb68f..09028bfe 100644 --- a/src/DiffEngine.Tests/diffTools.include.md +++ b/src/DiffEngine.Tests/diffTools.include.md @@ -490,17 +490,17 @@ Non-MDI tools are preferred since it allows [DiffEngineTray](tray.md) to track a #### Notes: - * Ensure that file backups are either [disabled](winmerge-no-backup.png) or changed to use a [Global backup folder](winmerge-backup-directory.png). * [Command line reference](https://manual.winmerge.org/en/Command_line.html). * `/u` Prevents WinMerge from adding paths to the Most Recently Used (MRU) list. * `/wl` Opens the left side as read-only. * `/dl` and `/dr` Specifies file descriptions in the title bar. * `/e` Enables close with a single Esc key press. + * `/cfg Backup/EnableFile=0` disable backup files. #### Windows settings: - * Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" ` - * Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" ` + * Example target on left arguments: `/u /wr /e "targetFile.txt" "tempFile.txt" /dl "targetFile.txt" /dr "tempFile.txt" /cfg Backup/EnableFile=0 ` + * Example target on right arguments: `/u /wl /e "tempFile.txt" "targetFile.txt" /dl "tempFile.txt" /dr "targetFile.txt" /cfg Backup/EnableFile=0 ` * Scanned paths: * `%PATH%WinMergeU.exe` * `%ProgramFiles%\WinMerge\WinMergeU.exe` diff --git a/src/DiffEngine/Implementation/WinMerge.cs b/src/DiffEngine/Implementation/WinMerge.cs index 2d5d4a5a..b00ad62e 100644 --- a/src/DiffEngine/Implementation/WinMerge.cs +++ b/src/DiffEngine/Implementation/WinMerge.cs @@ -6,14 +6,14 @@ static string LeftArguments(string temp, string target) { var tempTitle = Path.GetFileName(temp); var targetTitle = Path.GetFileName(target); - return $"/u /wr /e \"{target}\" \"{temp}\" /dl \"{targetTitle}\" /dr \"{tempTitle}\""; + return $"/u /wr /e \"{target}\" \"{temp}\" /dl \"{targetTitle}\" /dr \"{tempTitle}\" /cfg Backup/EnableFile=0"; } static string RightArguments(string temp, string target) { var tempTitle = Path.GetFileName(temp); var targetTitle = Path.GetFileName(target); - return $"/u /wl /e \"{temp}\" \"{target}\" /dl \"{tempTitle}\" /dr \"{targetTitle}\""; + return $"/u /wl /e \"{temp}\" \"{target}\" /dl \"{tempTitle}\" /dr \"{targetTitle}\" /cfg Backup/EnableFile=0"; } return new( @@ -85,12 +85,12 @@ static string RightArguments(string temp, string target) @"%ProgramFiles%\WinMerge\", @"%LocalAppData%\Programs\WinMerge\")), Notes: """ - * Ensure that file backups are either [disabled](winmerge-no-backup.png) or changed to use a [Global backup folder](winmerge-backup-directory.png). * [Command line reference](https://manual.winmerge.org/en/Command_line.html). * `/u` Prevents WinMerge from adding paths to the Most Recently Used (MRU) list. * `/wl` Opens the left side as read-only. * `/dl` and `/dr` Specifies file descriptions in the title bar. * `/e` Enables close with a single Esc key press. + * `/cfg Backup/EnableFile=0` disable backup files. """); } } \ No newline at end of file