Am Montag, 4. Mai 2009 13:18:38 schrieb Richard Bos:
On Mon, May 04, 2009 at 01:09:45PM +0200, Adrian Schr?ter wrote:
Am Montag, 4. Mai 2009 12:55:39 schrieb Richard Bos: ..
I fix the conflicting perl-ldap.spec file. At least that is what I think, and execute: devel:languages:perl/perl-ldap/repairlink> osc ci -m "repair broken linkage (with Factory)" perl-ldap.spec Please resolve all conflicts before committing!
you need to tell osc that the conflict is resovled by
osc resolved $FILENAME
Ah, and that is executed in the repairlink directory?
Does the same count for the commit action, is that also to be executed from the repairlink directory?
the repairlink directory is like a checked out package source of the package, just with merged changes.
After that I assume it is okay, to remove the repairlink directory, after which a "osc update" will be sufficient, to get a updated working directory (in my case devel:language:perl/perl-ldap), isn't it?
Would it be okay, to remove the project*.diff files, would that start a rebuild? In this particular case, it would be a quick and easy solution.
yes, but you need also remove it from _link file.