[Patch try#2] convert: Separate trunk detection from branch layout detection

[Edouard Gomez]

> If you agree with the changes above, I can edit them and push the
> patch directly, as you wish.

Agreed.

-- 
Edouard Gomez