https://bugzilla.novell.com/show_bug.cgi?id=732918 https://bugzilla.novell.com/show_bug.cgi?id=732918#c0 Summary: Diff and link to parent gone when conflict is present Classification: openSUSE Product: openSUSE.org Version: unspecified Platform: Other OS/Version: Other Status: NEW Severity: Normal Priority: P5 - None Component: BuildService AssignedTo: bnc-team-screening@forge.provo.novell.com ReportedBy: toddrme2178@gmail.com QAContact: adrian@suse.com Found By: --- Blocker: --- User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20100101 Firefox/8.0 When there is a conflict in your package (which, if you are using the default branching settings, happens any time there is a change in the parent package of a package you have modified), the web interface shows an error message saying the conflict exists. The problem is that this error message take the place of both the link to the parent package and the diff showing the difference with the parent package. There are two major problems with this: 1. It makes it very hard to identify and manually correct the problem, since you can't see where the difference with the parent package lies. You have to manually download the conflicting files and run a diff on them. 2. It makes it hard to even reach the parent package, since the link that takes you to the parent package is gone. This makes is unnecessary difficult to just copy and paste the parent version of the conflicting file, since you have to manually either search for or navigate to the parent project and then find the parent package there. Reproducible: Always Steps to Reproduce: 1. Branch a package you have control over. 2. Edit the spec file in the branch version 3. Edit the spec file in the parent package in a different way Actual Results: The link to the parent package and the link to the diff with the parent package both disappear. Expected Results: The link to the parent package and the link to the diff with the parent package both remain. -- Configure bugmail: https://bugzilla.novell.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.