[opensuse-buildservice] osc: handling of conflicts
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? Sidenote for all who wonder what I'm doing: I have added a patch to KMail so that it displays several bugzilla headers in fancy view. If you are interested, you can find the packages and the patch in home:cboltz. Regards, Christian Boltz -- Herzlich willkommen, kann ich nur sagen. In der linken Ecke der Herausforderer Timo "Newbie" Nentwig, in der rechten Ecke der Weltmeister /usr/bin/"MailCruncher"/procmail, mit satten 70 Kilobyte Lebendgewicht klarer Favorit... Soll ich gongen? [Ratti in suse-linux] --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
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
Hello, on Freitag, 20. April 2007, Dr. Peter Poeml wrote:
On Fri, Apr 20, 2007 at 12:13:55PM +0200, Christian Boltz wrote:
How can I force osc to remove the conflicts flag and download the file?
Just as with svn,
(given you know it ;-))
you need to call "osc resolve", after manually resolving the conflict.
OK, that worked. Thanks! Sidenote: IMHO it would be a good idea to list the conflicts on osc up as a reminder. Regards, Christian Boltz --
aber wieso ist dann plötzlich Korn nicht mehr in der Leiste rechts unten zu finden? Hae? Wo? Wie? Was? Das Korn, das das blinde Huhn gefunden hat? Und in welcher Leiste war das zu finden? Ist vielleicht ein Leistenbruch schuld? [> Matthias Staudinger und David Haller in suse-linux]
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Sun, Apr 22, 2007 at 03:25:18PM +0200, Christian Boltz wrote:
Sidenote: IMHO it would be a good idea to list the conflicts on osc up as a reminder.
It is shown during update right when the conflict occurs, and later in the output of the status subcommand. I don't think that it would be better to show it again which subsequent update runs. Peter -- Allen Gewalten zum Trutz sich erhalten. SUSE LINUX Products GmbH Research & Development
On 2007-04-20 12:13:55 +0200, Christian Boltz wrote:
osc stat still shows C kdepim3.spec
How can I force osc to remove the conflicts flag and download the file?
osc resolved kdepim3.spec -- openSUSE - SUSE Linux is my linux openSUSE is good for you www.opensuse.org --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (3)
-
Christian Boltz
-
Dr. Peter Poeml
-
Marcus Rueckert