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.

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

Nodes aren't always visited in TdmMerge causing incorrect content conflicts #82

Closed
slarse opened this issue Mar 23, 2020 · 0 comments
Closed
Labels
bug Something isn't working

Comments

@slarse
Copy link
Collaborator

slarse commented Mar 23, 2020

There are cases when not every node actually appears as a predecessor, such as in delete/delete conflicts (#81). Then, the content for that node is never checked and the PcsInterpreter may flag a content conflict, even though that's not really the issue at hand.

A simple solution is to check the content of both the predecessor and successor for each PCS in the merge. There's no point in checking the parent as well, as a node that never appears as a predecessor or successor will never be processed by the PcsInterpreter, with the exception of the virtual root.

@slarse slarse added the bug Something isn't working label Mar 23, 2020
@slarse slarse changed the title Node's arent always visited in TdmMerge causing incorrect content conflicts Nodes aren't always visited in TdmMerge causing incorrect content conflicts Mar 23, 2020
@slarse slarse closed this as completed in 69b5816 Mar 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

1 participant