On Fri, Apr 20, 2007 at 12:13:55PM +0200, Christian Boltz wrote:
Hello,
I have a question regarding conflict handling in osc.
I have checked out kdepim3 from KDE:KDE3 some time ago and did some modifications in the spec file.
Now I wanted to update to the latest version (osc up) and got a conflict notice for the specfile. Since I have saved my changes as patch, I simply deleted the specfile and called osc up again, hoping that it would download the specfile. Unfortunately, osc only prints "at revision 146", but does not download the missing file.
osc stat still shows C kdepim3.spec
How can I force osc to remove the conflicts flag and download the file?
Just as with svn, you need to call "osc resolve", after manually resolving the conflict. You will find a foo.rXXX and foo.mine in the directory, and you could do mv foo.rXXX foo osc resolve foo Peter -- Allen Gewalten zum Trutz sich erhalten. SUSE LINUX Products GmbH Research & Development