Mailinglist Archive: opensuse-factory (487 mails)

[Marcus Meissner <meissner@xxxxxxx>]

On Wed, Feb 15, 2012 at 12:08:32AM +0400, Ilya Chernykh wrote:
> On Monday 13 February 2012 16:36:17 Stephan Kulow wrote:
>
> > > osc sr -m"rename to kde3-krecord, spec file cleanup" KDE:KDE3 krecord 
> > > openSUSE:Factory kde3-krecord
> > >
> > > sorry again.
> >
> > Thanks for wasting my time then ;(
> >
> > The bug is in osc then - but my osc did the right thing when calling the
> > above, so I guess you have some osc < 0.133?
>
> The last commit where you changed the license syntax has broken this package. 
> It seems it cannot merge the sources.
>
> Files could not be expanded: conflict in file ksimus.spec 

So you basically need to merge them back:
        osc pull
        ... resolve the conflicts (edit the ksimus.spec)
        osc resolved ksimus.spec
        osc ci

ciao, Marcsu
-- 
To unsubscribe, e-mail: opensuse-factory+unsubscribe@xxxxxxxxxxxx
To contact the owner, e-mail: opensuse-factory+owner@xxxxxxxxxxxx