sailfishos-patches / patchmanager

Patchmanager for SailfishOS
https://openrepos.net/content/patchmanager/patchmanager
Other
21 stars 22 forks source link

Some patches show conflicts with themselves #82

Closed b100dian closed 2 years ago

b100dian commented 2 years ago

If a patch has several hunks for the same file, the +++ prefix appears more than one time, and it is added more than once to filesConflict (https://github.com/sailfishos-patches/patchmanager/blob/dc781cdcb365a60ca2333b141decbf88e92a0626/src/bin/patchmanager-daemon/patchmanagerobject.cpp#L1600).

Example patch: https://coderus.openrepos.net/pm2/project/browser-history-swipes

(note that in m_fileToPatch patches are not added twice. That member seems to be used for some file watching. Maybe it can be used for conflicts too, it has the same structure as filesConflict)

Olf0 commented 2 years ago