Mergetool

[pasbi]

Provide a compare and merge tool to merge two versions of a repertoire

[pasbi]

Open document A.can => "File" -> "Merge with ..." => select Document B.can

• Show dialog, central widget is a TreeView, showing all conflicts. Conflicts:
• Song is in A but not in B => Delete candidate
• Song is in B but not in A => Add candidate
• Song is in A and in B but has different Attributes / Attachments => Edit candidate
  • do the same for the Attachments (find delete and add and edit candidates)
  • list the attribute edit candidates
• Song equality: titles and Interprets are identical.
• Attachment equality: same name and same parent(-song)
• Event equality: same date
• Do the same for Events/Setlists
• user should have opportunity to mark A- and B-songs/events/attachments as identical, i.e. two songs which have different titles (e.g. due to a renaming)
• User would never want to make use of this opportunity if we provide a better equality-detector. Do this.

[pasbi]

The merge tool works. However, we still don't have "edit recognition". I.e. if you have a project, copy it and than edit just one character in the chorpattern of any song, the merge editor will display that the song has been deleted and an equal named song has been added. You must mark them as "the same" manually, then you can see that a chord pattern attachment has been deleted and one has been added. Then you can choose whether you want to keep the old or the new attachment.