本文整理汇总了C++中MergeResult::removeMergeKey方法的典型用法代码示例。如果您正苦于以下问题:C++ MergeResult::removeMergeKey方法的具体用法?C++ MergeResult::removeMergeKey怎么用?C++ MergeResult::removeMergeKey使用的例子?那么, 这里精选的方法代码示例或许可以为您提供帮助。您也可以进一步了解该方法所在类MergeResult
的用法示例。
在下文中一共展示了MergeResult::removeMergeKey方法的1个代码示例,这些例子默认根据受欢迎程度排序。您可以为喜欢或者感觉有用的代码点赞,您的评价将有助于系统推荐出更棒的C++代码示例。
示例1: resolveConflict
void OneSideStrategy::resolveConflict(const MergeTask& task, Key& conflictKey, MergeResult& result)
{
string lookupPath;
Key winningKey;
switch (winningSide)
{
case BASE:
lookupPath = rebasePath (conflictKey, task.mergeRoot, task.baseParent);
winningKey = task.base.lookup(lookupPath);
break;
case OURS:
lookupPath = rebasePath (conflictKey, task.mergeRoot, task.ourParent);
winningKey = task.ours.lookup(lookupPath);
break;
case THEIRS:
lookupPath = rebasePath (conflictKey, task.mergeRoot, task.theirParent);
winningKey = task.theirs.lookup(lookupPath);
break;
}
if (winningKey)
{
conflictKey.setString(winningKey.getString());
result.resolveConflict(conflictKey);
result.addMergeKey(conflictKey);
} else
{
result.resolveConflict(conflictKey);
result.removeMergeKey(conflictKey);
}
}