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

2.0: Base document in Conflict should be null when there is no base #1835

Closed
pasin opened this issue Jul 24, 2017 · 0 comments
Closed

2.0: Base document in Conflict should be null when there is no base #1835

pasin opened this issue Jul 24, 2017 · 0 comments
Assignees
@pasin
Labels
bug
Milestone
2.0 DB 13

Comments

@pasin
Copy link
Contributor

pasin commented Jul 24, 2017

When there is no base on common ancestor doc, the base is an empty document which is not correct. This bug is found when investigating https://github.com/couchbase/couchbase-lite-android/issues/1293.
@pasin pasin added this to the 2.0 DB 13 milestone Jul 24, 2017
@pasin pasin added the bug label Jul 24, 2017
@pasin pasin self-assigned this Jul 24, 2017
pasin added a commit that referenced this issue Jul 24, 2017
@pasin
Fix conflicting base is not null when there is no base
926c16a 
Currently the base is an empty doc instead of null when there is no base document. This is fixed by checking if the base c4doc is null or not, if it’s null, the base document should be null.

#1835
@pasin pasin closed this as completed Jul 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@pasin pasin

Labels
bug
Projects
None yet
Milestone
2.0 DB 13
Development

No branches or pull requests
1 participant
@pasin