-
Notifications
You must be signed in to change notification settings - Fork 5
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
T257301: Add conflicts warning in layer-update #127
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@@ -74,6 +74,12 @@ def run(self): | |||
return | |||
|
|||
self._playback_paths(sorted(paths)) | |||
self.sync.record(sorted(paths), recurse=False) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This does not work in dry-run
mode (the rollback already happened and not all paths are found) and even without it, I get a lot of errors that paths can't be recorded because they don't exist aymore (with skip_errors=True
, it still works, but the output is not pretty).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this whole plan does not work well with dry-run
. For now, I will only do the re-record and conflict check in non-dry-run mode. Otherwise we would need to do the re-record before the rollback and also roll back the changes done by this on the file system. Which will be difficult if there are multiple phases...
Something is still not right here... |
Ready for review again. Had to track down some more errors that the live test revealed. |
f35e36b
to
cf9395c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
No description provided.