On Thu, Sep 25, 2008 at 04:52:45PM +0200, Adrian Schröter wrote:
On Thursday 25 September 2008 16:47:38 wrote Peter Poeml:
On Thu, Sep 25, 2008 at 10:59:23AM +0200, Ludwig Nussel wrote:
Hi,
Suppose I have a package linked from another project with patches (project*.diff) on top of it. Now the other package is updated and the patches no longer apply. osc rdiff doesn't work because it can't apply the patches either. How do I verify how and which of my changes got applied to the linked package?
I had the same at least two times, and it was a bug mess and manual work to sort it out.
Especially, it seems it can happen with applying submit requests - which is the following bug, I assume? https://bugzilla.novell.com/show_bug.cgi?id=426236
sure, if an intermediate state gets submitted, this can happen. We can improve this maybe in the server side clean up, but we need in any case a better handling of not matching patches in our frontends.
I don't understand the circumstances when it happens very well. An observation was that it might have to do with another submission (of conflicting changes) to the target project.
osc could for example checkout unexpanded, and check which changes have been merged. And keep conflicting changes like svn does with the conflicting changes in the files.
Well, link expansion happens on the server side... maybe it should be possible to expand the link based on *that* revision of the target package where the link still applied.
I dunno if there are standard tools around which can get utelized for this.
bye adrian
Peter -- Contact: admin@opensuse.org (a.k.a. ftpadmin@suse.com) #opensuse-mirrors on freenode.net Info: http://en.opensuse.org/Mirror_Infrastructure SUSE LINUX Products GmbH Research & Development