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

INI: Merging Does not Work #1696

Open
sanssecours opened this Issue Nov 4, 2017 · 1 comment

Comments

Projects
None yet
2 participants
@sanssecours
Contributor

sanssecours commented Nov 4, 2017

Description

It seems like kdb merge does not work correctly if we use INI as default storage.

Steps to Reproduce the Problem

  1. Configure Elektra with INI as default storage:

    mkdir build
    cd build
    cmake .. -GNinja -DPLUGINS='ALL' -DKDB_DB_FILE='default.ini' -DKDB_DB_INIT='elektra.ini' -DKDB_DEFAULT_STORAGE=ini
  2. Build Elektra:

    ninja
  3. Run the following commands:

    kdb set user/tests/script/mergetest/ours/key   init
    kdb set user/tests/script/mergetest/theirs/key init
    kdb set user/tests/script/mergetest/base/key   init
    
    kdb merge                            \
      user/tests/script/mergetest/ours   \
      user/tests/script/mergetest/theirs \
      user/tests/script/mergetest/base   \
      user/tests/script/mergetest/merged

Expected Result

The tool kdb merge should produce a new key user/tests/script/mergetest/merged with the value init.

Describe what actually happened

1 conflicts were detected that could not be resolved automatically:
user/tests/script/mergetest/merged/key
ours: CONFLICT_META, theirs: CONFLICT_META

Merge unsuccessful.

Additional Information

@markus2330

This comment has been minimized.

Show comment
Hide comment
@markus2330

markus2330 Nov 4, 2017

Contributor

Thank you for reporting this issue! It might be simply caused by the internal metadata, then it is yet-another-instance of #1695.

Seems like we need debug info in src/merging/metamergestrategy.cpp or even better a debug merger strategy to find out.

Contributor

markus2330 commented Nov 4, 2017

Thank you for reporting this issue! It might be simply caused by the internal metadata, then it is yet-another-instance of #1695.

Seems like we need debug info in src/merging/metamergestrategy.cpp or even better a debug merger strategy to find out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment