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

[Shawn Walker]

On 03/03/07, Mike Kuhnkey <mkuhnkey at comcast.net> wrote:
> What do conflict markers look like....? ( Perhaps "<<<<<<<" or ">>>>>>>"?)

Correct.

> 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?

Did you have any changes to this particular spec file? If you did,
that is likely why you have a conflict.

-- 
"Less is only more where more is no good." --Frank Lloyd Wright

Shawn Walker, Software and Systems Analyst
binarycrusader at gmail.com - http://binarycrusader.blogspot.com/