D9347: Ignore baloo urls created from new KIO model

[Elvis Angelaccio]

elvisangelaccio added a comment.


  In https://phabricator.kde.org/D9347#187655, @renatoo wrote:
  
  > In https://phabricator.kde.org/D9347#185062, @elvisangelaccio wrote:
  >
  > > Yes, please merge on master and then rebase https://phabricator.kde.org/D9333.
  >
  >
  > Hi, I tried to merge this to master but that causes some regressions and unit tests started to fail because this will ignore baloo urls that came from NEW KIO and the tests expect that urls be part of the list. The only easy way that I see it to be merged in master is that we need make sure that https://phabricator.kde.org/D9333 will land together otherwise that will cause regressions. Is that a option? I am not sure if that is a good idea.
  
  
  I see, then let's merge with `git merge -s recursive -Xours Applications/17.12`, which will ignore this patch.

REPOSITORY
  R318 Dolphin

REVISION DETAIL
  https://phabricator.kde.org/D9347

To: renatoo, ngraham, elvisangelaccio
Cc: rkflx, cfeck, elvisangelaccio, ervin, mlaurent, #dolphin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20180108/a2706d86/attachment.htm>