Skip to content
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

Jump to bottom

Kdesktop 772 mode delete conflict resolution on directory is broken #69

Merged
merged 7 commits into from
Apr 23, 2024
Merged

Kdesktop 772 mode delete conflict resolution on directory is broken #69

merged 7 commits into from
Apr 23, 2024

Conversation

ClementKunz
Copy link
Contributor

  • Fix the update tree in UpdateNodeWithDb
  • Add the possibility to draw the update tree in log for debugging purpose

@ClementKunz ClementKunz marked this pull request as ready for review April 23, 2024 07:22
@ClementKunz ClementKunz requested a review from a team as a code owner April 23, 2024 07:22
luc-guyot-infomaniak
luc-guyot-infomaniak reviewed Apr 23, 2024
View reviewed changes
Copy link
Contributor

@luc-guyot-infomaniak luc-guyot-infomaniak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if the logging operations could be made less redundant by means of helper functions.

src/libsyncengine/update_detection/update_detector/updatetreeworker.cpp Show resolved Hide resolved
src/libsyncengine/update_detection/update_detector/updatetreeworker.cpp Outdated Show resolved Hide resolved
src/libsyncengine/update_detection/update_detector/updatetreeworker.cpp Show resolved Hide resolved
src/libsyncengine/update_detection/update_detector/updatetreeworker.cpp Outdated Show resolved Hide resolved
src/libsyncengine/update_detection/update_detector/updatetreeworker.cpp Outdated Show resolved Hide resolved
src/libsyncengine/update_detection/update_detector/updatetreeworker.cpp Show resolved Hide resolved
src/libsyncengine/update_detection/update_detector/updatetreeworker.h Outdated Show resolved Hide resolved
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@ChristopheLarchier ChristopheLarchier merged commit 2158b6a into RELEASE-3.6.0 Apr 23, 2024
4 checks passed
@ChristopheLarchier ChristopheLarchier deleted the KDESKTOP-772-Mode-Delete-conflict-resolution-on-directory-is-broken branch April 23, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luc-guyot-infomaniak luc-guyot-infomaniak luc-guyot-infomaniak approved these changes

@ChristopheLarchier ChristopheLarchier ChristopheLarchier approved these changes

Assignees

@ClementKunz ClementKunz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ClementKunz @ChristopheLarchier @luc-guyot-infomaniak