Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Proposed by
Marco Trevisan (Treviño)
Status: | Superseded |
---|---|
Proposed branch: | ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash |
Merge into: | ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master |
Prerequisite: | ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search |
Diff against target: |
236 lines (+151/-1) (has conflicts) 7 files modified
debian/changelog (+4/-1) debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch (+4/-0) debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch (+4/-0) debian/patches/0018-search-engine-add-locate-based-search-engine.patch (+4/-0) debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch (+4/-0) debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch (+127/-0) debian/patches/series (+4/-0) Conflict in debian/changelog Conflict in debian/control Conflict in debian/control.in Conflict in debian/gbp.conf Conflict in debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch Conflict in debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch Conflict in debian/patches/0018-search-engine-add-locate-based-search-engine.patch Conflict in debian/patches/03_translations_list_update.patch Conflict in debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch Conflict in debian/patches/series Conflict in debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch Conflict in debian/patches/zg_activity_logging.patch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Desktop | Pending | ||
Review via email: mp+355858@code.launchpad.net |
This proposal has been superseded by a proposal from 2018-09-28.
To post a comment you must log in.
Unmerged commits
- 1f38196... by Marco Trevisan (Treviño)
- 45370f0... by Marco Trevisan (Treviño)
- da3b388... by Sebastien Bacher
- 6630212... by Sebastien Bacher
- 013b39d... by Marco Trevisan (Treviño)
- a798faa... by Marco Trevisan (Treviño)
- 016eb1c... by Marco Trevisan (Treviño)
- 16f3aaf... by Marco Trevisan (Treviño)
- 6c56c37... by Marco Trevisan (Treviño)
- b3a05da... by Marco Trevisan (Treviño)