orphan: fix buggy case of try resolving orphan merge two times

Because of not having the exact condition (see the changes)
it was not filtering the case when none of the parent is obsolete.

Changes in test file reflect the fixed behavior.