Skip to content

disable Backup for WinMerge#368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimonCropp merged 1 commit into from
Jul 9, 2023
Merged

disable Backup for WinMerge #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/diff-tool.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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`
Expand Down
Binary file removeddocs/winmerge-backup-directory.png
View file
Open in desktop
Binary file not shown.
Binary file removeddocs/winmerge-no-backup.png
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/DiffEngine.Tests/diffTools.include.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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`
Expand Down
6 changes: 3 additions & 3 deletions src/DiffEngine/Implementation/WinMerge.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand DownExpand Up@@ -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.
""");
}
}