http://bugzilla.novell.com/show_bug.cgi?id=578315 http://bugzilla.novell.com/show_bug.cgi?id=578315#c0 Summary: repairlink doesn't manage all files with conflicts Classification: openSUSE Product: openSUSE.org Version: unspecified Platform: x86-64 OS/Version: Other Status: NEW Severity: Normal Priority: P5 - None Component: BuildService AssignedTo: bnc-team-screening@forge.provo.novell.com ReportedBy: dmuhamedagic@novell.com QAContact: adrian@novell.com CC: lmb@novell.com Found By: --- Blocker: --- We had a conflicting change in the package openais, project Devel:HAE;SLES11SP1. osc shows in my copy, which contains changes not yet committed: [0]hex-10:openais > iosc up Link "Devel:HAE:SLE11SP1/openais" cannot be expanded: conflict in file openais.changes Use "osc repairlink" to fix merge conflicts. [1]hex-10:openais > iosc repairlink using link target of last commit openais-1.1.1.tar.gz G openais-suse-init.patch G openais.changes C openais.spec ready Please change into the 'repairlink' directory, fix the conflicts (files marked with 'C' above), run 'osc resolved ...', and commit the changes. I resolved the openais.spec (marked with C): [0]hex-10:openais > iosc resolved openais.spec Resolved conflicted state of "openais.spec" But: [0]hex-10:openais > iosc up Link "Devel:HAE:SLE11SP1/openais" cannot be expanded: conflict in file openais.changes Use "osc repairlink" to fix merge conflicts. [1]hex-10:openais > iosc repairlink using link target of last commit openais-1.1.1.tar.gz G openais-suse-init.patch G openais.changes C openais.spec ready Please change into the 'repairlink' directory, fix the conflicts (files marked with 'C' above), run 'osc resolved ...', and commit the changes. And so on, ad inf. What does state "G" mean? How is this supposed to be resolved? -- Configure bugmail: http://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.