D12005: Fix merging of terms in the AdvancedQueryParser

This revision was automatically updated to reflect the committed changes. Closed by commit R293:c91c43393c33: Fix merging of terms in the AdvancedQueryParser (authored by bruns). REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D12005?vs=31685=32089 REVISION

D12005: Fix merging of terms in the AdvancedQueryParser

michaelh accepted this revision. This revision is now accepted and ready to land. REPOSITORY R293 Baloo BRANCH baloo_term_cleanup_2 REVISION DETAIL https://phabricator.kde.org/D12005 To: bruns, #baloo, michaelh Cc: #frameworks, ashaposhnikov, michaelh, astippich, spoorun, ngraham, bruns,

D12005: Fix merging of terms in the AdvancedQueryParser

bruns updated this revision to Diff 31685. REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D12005?vs=31585=31685 BRANCH baloo_term_cleanup_2 REVISION DETAIL https://phabricator.kde.org/D12005 AFFECTED FILES autotests/unit/lib/advancedqueryparsertest.cpp

D12005: Fix merging of terms in the AdvancedQueryParser

bruns updated this revision to Diff 31585. bruns added a comment. rebased REPOSITORY R293 Baloo CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D12005?vs=31543=31585 BRANCH baloo_term_cleanup_2 REVISION DETAIL https://phabricator.kde.org/D12005 AFFECTED FILES

D12005: Fix merging of terms in the AdvancedQueryParser

michaelh added a comment. lgtm. Please rebase (preferrably after landing D11826 ), so I can run the test. Cherry Pick Failed! Exception Command failed with error #1! COMMAND git cherry-pick 'arcpatch-D11907' REPOSITORY R293

D12005: Fix merging of terms in the AdvancedQueryParser

bruns edited the test plan for this revision. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D12005 To: bruns, #baloo, michaelh Cc: #frameworks, ashaposhnikov, michaelh, astippich, spoorun, ngraham, bruns, alexeymin

D12005: Fix merging of terms in the AdvancedQueryParser

bruns created this revision. bruns added reviewers: Baloo, michaelh. Restricted Application added projects: Frameworks, Baloo. Restricted Application added a subscriber: Frameworks. bruns requested review of this revision. REVISION SUMMARY The code merged compatible terms only if the left hand

D12005: Fix merging of terms in the AdvancedQueryParser

bruns added a dependency: D11826: Simplify Term operator&& and ||. REPOSITORY R293 Baloo REVISION DETAIL https://phabricator.kde.org/D12005 To: bruns, #baloo, michaelh Cc: #frameworks, ashaposhnikov, michaelh, astippich, spoorun, ngraham, bruns, alexeymin