[desktop-discuss] Re: Re: Re: Flagday: spec-files reorg

[Mike Kuhnkey]

What do conflict markers look like....? ( Perhaps "<<<<<<<" or ">>>>>>>"?)

SUNWPython-extra (13) -> %use pyrex = Pyrex.spec

Pyrex.spec (18) shows <<<<<<< .mine
Pyrex.spec (23) shows >>>>>>> .r10720

spec-files/base-specs shows:
Pyrex.spec
Pyrex.spec.mine
Pyrex.spec.r10718
Pyrex.spec.r10720

Only Pyrex.spec contains "<<<<<<<", or ">>>>>>>" .
The other files look fine....and if line numbering is consistent, looks like Version and Source strings are corrupted in Pyrex.spec but not in other files?
 
 
This message posted from opensolaris.org