I can no longer able to use arc patch because it wants to apply the dependent revisions, which are already in master, and fails. I'm no arc expert, is there a way to solve this?

In D12540#256278, @astippich wrote:

I can no longer able to use arc patch because it wants to apply the dependent revisions, which are already in master, and fails. I'm no arc expert, is there a way to solve this?

Use --skip-dependencies for arc patch.

IMO it's a problem with how Arcanist handles this, see my analysis in T8506#139481.

rebase on top of master and hopefully should apply cleanly

In D12540#256345, @rkflx wrote:

In D12540#256278, @astippich wrote:

I can no longer able to use arc patch because it wants to apply the dependent revisions, which are already in master, and fails. I'm no arc expert, is there a way to solve this?

Use --skip-dependencies for arc patch.

IMO it's a problem with how Arcanist handles this, see my analysis in T8506#139481.

Thanks!

astippich accepted this revision.May 1 2018, 4:12 PM

This revision is now accepted and ready to land.May 1 2018, 4:12 PM

Closed by commit R255:4e0455400955: extend MusicAudioTrack constructor to include composer and update tests (authored by mgallien). · Explain WhyMay 1 2018, 4:37 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			autotests/albummodeltest.cpp (78 lines)
M			autotests/allalbumsmodeltest.cpp (75 lines)
M			autotests/allartistsmodeltest.cpp (72 lines)
M			autotests/alltracksmodeltest.cpp (87 lines)
M			autotests/alltracksproxymodeltest.cpp (85 lines)
M			autotests/databaseinterfacetest.cpp (221 lines)
M			autotests/localfilelistingtest.cpp (69 lines)
M			autotests/manageheaderbartest.h (69 lines)
M			autotests/managemediaplayercontroltest.h (69 lines)
M			autotests/mediaplaylisttest.h (69 lines)
M			autotests/trackslistenertest.cpp (72 lines)
M			src/databaseinterface.h (20 lines)
M			src/databaseinterface.cpp (751 lines)
M			src/musicaudiotrack.h (3 lines)
M			src/musicaudiotrack.cpp (12 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	33145	9e6c4d9		Apr 26 2018, 12:42 PM	★	★
Diff 2	33380	7be7098	rebase on top of master and hopefully should apply cleanly	May 1 2018, 11:52 AM	★	★
Diff 3	33406	b36a926	R255:4e0455400955c6fa0879b46a8c0c7a0eacda0ac9	May 1 2018, 4:37 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
459895235fca	dab76dab00cb	7be7098cc6de	Matthieu Gallien	extend MusicAudioTrack constructor to include composer and update tests (Show More…)	Apr 26 2018, 12:40 PM

Status	Author	Revision
Closed	mgallien	D12586 starts storing lyricists in their own table to prepare for more
Closed	mgallien	D12568 starts storing composers in their own table to prepare for more
Closed	mgallien	D12548 extend MusicAudioTrack constructor to include lyricist and update tests
Closed	mgallien	D12540 extend MusicAudioTrack constructor to include composer and update tests
Closed	mgallien	D12537 extend MusicAudioTrack constructor to allow adding the genre
Closed	mgallien	D12532 use the same set of tracks for database automatic tests