Improve three-way diff to provide more accurate Sync status and diff result (issue #597)#604
Merged
jessesuen merged 1 commit intoargoproj:masterfrom Sep 15, 2018
Merged
Conversation
alexmt
approved these changes
Sep 15, 2018
util/diff/diff.go
Outdated
Collaborator
There was a problem hiding this comment.
nitpick: comment looks incomplete
jessesuen
force-pushed
the
597-three-way-diff
branch
from
6d15a38 to
065b863
Compare
leoluz
pushed a commit
to leoluz/argo-cd
that referenced
this pull request
Mar 13, 2025
* fix: deadlock on start missing watches Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com> * revert error Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com> * add unit test to validate some deadlock scenarios Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com> * test name Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com> * clarify comment Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com> --------- Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This changes 3-way-diffing such that it relies entirely on K8s strategic merge patch to calculate the proper diff status and result.