Fix handling of conflict when a folder title is changed

[laurent22]

A user did this:

I had three notebooks (was still getting the hang of it after months). One was work related, the other one was a generic "notes" and the third was for travelling.
I discovered one can nest notebooks, so I renamed "notes" to "Personal" and then dragged "travelling" inside of it.
As soon as Joplin synchronised, "Personal" disappeared, and with it all my personal notes.

This is part of the deletion log:

2025-02-28 14:30:12: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...
2025-02-28 14:30:12: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...
2025-02-28 14:30:13: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...
2025-02-28 14:30:13: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...
2025-02-28 14:30:14: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...
2025-02-28 14:30:14: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...
2025-02-28 14:30:14: DeleteAction: sync: handleConflictAction: non-note conflict: folder title: "Personal",titles: REDACTED...

Based on this it seems "Personal" was detected as having been deleted. So we need to see if we can replicate this and find out whether conflicts are handled properly or not.

Additional feedback from user:

I did not delete these on any other device (it is something I was testing out for the first time on this laptop).

I don't know if it helps, but I also tried to rearrange the notebooks (which I realised one cannot do), so I wonder if that had any impact on Joplin.

That's interesting - so it seems it's possible to create a conflict even if no other device is synchronising with the sync target. That was with Dropbox, so we should test with it. Make many changes to notebooks - change title, move them in other notebooks, etc. And see if we can replicate a conflict.

More information:

I had a notebook for the company I work for, let's say "Company".
I decided to nest it under a new notebook called "Work", therefore I right-clicked on it and create a new notebook called "Work". However now it was "Work" inside "Company", so I dragged "Work" out and then dragged "Company" into it.

Ref: https://discourse.joplinapp.org/t/renamed-the-notes-notebook-to-something-else-and-upon-synchronising-i-lost-everything/44086?u=laurent

[mrjo118]

I gave this a quick test on mobile using my existing profile on dropbox sync and I wasn't able to reproduce the issue. It's possible to move notebooks around a bit faster on desktop, so I wonder if it might be some kind of race condition