Kdb merge tool. More...
#include "kdb.h"
Include dependency graph for kdbmerge.h:
Functions | |
| KeySet * | elektraMerge (KeySet *our, Key *ourRoot, KeySet *their, Key *theirRoot, KeySet *base, Key *baseRoot, Key *resultKey, int strategy, Key *informationKey) |
| This function can incorporate changes from two modified versions (our and their) into a common preceding version (base) of a key set. More... | |
| int | getConflicts (Key *informationKey) |
| This function returns the number of conflicts that is store in the key. More... | |
Detailed Description
Kdb merge tool.
- Copyright
- BSD License (see LICENSE.md or https://ww.libelektra.org)
Function Documentation
◆ elektraMerge()
| KeySet* elektraMerge | ( | KeySet * | our, |
| Key * | ourRoot, | ||
| KeySet * | their, | ||
| Key * | theirRoot, | ||
| KeySet * | base, | ||
| Key * | baseRoot, | ||
| Key * | resultRoot, | ||
| int | strategy, | ||
| Key * | informationKey | ||
| ) |
This function can incorporate changes from two modified versions (our and their) into a common preceding version (base) of a key set.
This lets you merge the sets of changes represented by the two newer key sets. This is called a three-way merge between key sets.
Join three key sets together
- Parameters
-
our our key set ourRoot key that has the root of our as name their their key set theirRoot key that has the root of their as name base base key set baseRoot key that has the root of base as name resultRoot the name of this key determines where the resulting key set will be stored strategy specify which merge strategy to choose in case of a conflict informationKey stores errors as well as statistics
- Returns
- the merged key set and NULL on error
◆ getConflicts()
| int getConflicts | ( | Key * | informationKey | ) |
This function returns the number of conflicts that is store in the key.
- Parameters
-
informationKey contains the statistics in its meta information
- Returns
- the number of conflicts stored in the key
