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.
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
backup --files-from-verbatim allow merging snapshots #3405
Open
gmgigi96
wants to merge
19
commits into
restic:master
Choose a base branch
from
gmgigi96:merge_snapshots
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gmgigi96
changed the title
Add ieiciccincrementalsikgtgilchldndckbhijfichdtiegldrrchfcj
Add incremental backups
May 19, 2021
Awesome work. For our use case, we can guess the files to backup before calling restic, and this feature will reduce drastically the time to backup ! Looking forward to see this merged! |
gmgigi96
changed the title
Add incremental backups
backup --files-from: allow merging snapshots
Jun 17, 2021
gmgigi96
changed the title
backup --files-from: allow merging snapshots
backup --files-from-verbatim allow merging snapshots
Jun 18, 2021
gmgigi96
force-pushed
the
merge_snapshots
branch
from
August 17, 2021 08:10
4d9a7ec
to
5e3844b
Compare
Resolved the conflicts with the master. |
Changed the library used in the tests for writing into files, in order to be compatible with previous go versions |
@fd0 @MichaelEischer Any feedback for this? :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR change? What problem does it solve?
Until now, when --files-from-verbatim option is used in a backup, restic creates a new snapshot containing only the files specified in the file passed in that option. But when a repository is used to backup files of the same directory, it would be nice have all the snapshots with a full view of the folder, while specifying only the updated (new, modified and removed) files or directories during the backup process.
This PR adds an new option into backup, --merge, that will merge the parent snapshot with the current list of files specified in --files-from-verbatim.
This has two pros:
Example:
Was the change discussed in an issue or in the forum before?
https://forum.restic.net/t/backup-parent-behavior/3286
Closes #3118
Checklist
changelog/unreleased/
that describes the changes for our users (template here)gofmt
on the code in all commits