[opensuse-buildservice] diff: 1 out of 2 hunks FAILED
Hello @all, im working in my Repo (home:saigkill) on updating Packages to 11.1. Now i have written an Specfile with included diff-File. The osc System says: 1 out of 2 hunks FAILED. But the File don't look like a corrupt File. Can anyone explain, how to work it? See you Sascha -- Sincereley yours Sascha Manns openSUSE Marketing Team (Weekly News) openSUSE Build Service Web: http://saschamanns.gulli.to Blog: http://lizards.opensuse.org/author/saigkill
On 2009-01-04 22:43:02 +0100, Sascha 'saigkill' Manns wrote:
Hello @all,
im working in my Repo (home:saigkill) on updating Packages to 11.1.
Now i have written an Specfile with included diff-File. The osc System says: 1 out of 2 hunks FAILED. But the File don't look like a corrupt File.
But it probably can't be applied to the current sources files (maybe some files etc. were changed in the source...).
Can anyone explain, how to work it?
About which package are you talking? I just looked at the MountManager package in your home:saigkill project but this one only contains one patch (which applies flawlessly). Marcus -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Am Sonntag 04 Januar 2009 23:03:05 schrieb Marcus Hüwe:
On 2009-01-04 22:43:02 +0100, Sascha 'saigkill' Manns wrote:
Hello @all,
im working in my Repo (home:saigkill) on updating Packages to 11.1.
Now i have written an Specfile with included diff-File. The osc System says: 1 out of 2 hunks FAILED. But the File don't look like a corrupt File.
But it probably can't be applied to the current sources files (maybe some files etc. were changed in the source...). The source is fresh, and i've made only changes in one File (configure)
Can anyone explain, how to work it?
About which package are you talking? I just looked at the MountManager package in your home:saigkill project but this one only contains one patch (which applies flawlessly). home:saigkill Package: MountManager Patch: mm_desktop_files.diff
-- Sincereley yours Sascha Manns openSUSE Marketing Team (Weekly News) openSUSE Build Service Web: http://saschamanns.gulli.to Blog: http://lizards.opensuse.org/author/saigkill -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Sun, 4 Jan 2009 22:43:02 +0100, you wrote:
im working in my Repo (home:saigkill) on updating Packages to 11.1.
Which package, which patch?
says: 1 out of 2 hunks FAILED. But the File don't look like a corrupt File.
It means that out of two changes contained in the patch only one could be applied. When that happens, a .rej file is created that contains the part(s) of the patch that didn't apply. Create a copy of the file to be patched before applying the patch, apply the patch, see if the failed hunk can still be applied and if yes, apply the failed hunk manually and then afterwards create a new diff that replaces the original one. Philipp -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Am Montag 05 Januar 2009 01:59:11 schrieb Philipp Thomas:
On Sun, 4 Jan 2009 22:43:02 +0100, you wrote:
says: 1 out of 2 hunks FAILED. But the File don't look like a corrupt File.
It means that out of two changes contained in the patch only one could be applied. When that happens, a .rej file is created that contains the part(s) of the patch that didn't apply. Create a copy of the file to be patched before applying the patch, apply the patch, see if the failed hunk can still be applied and if yes, apply the failed hunk manually and then afterwards create a new diff that replaces the original one. Where are osc place the -rej File?
-- Sincereley yours Sascha Manns openSUSE Marketing Team (Weekly News) openSUSE Build Service Web: http://saschamanns.gulli.to Blog: http://lizards.opensuse.org/author/saigkill -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Mon, 5 Jan 2009 08:51:00 +0100, you wrote:
Where does osc place the -rej File?
It's not osc but rather patch (called from rpmbuild) that generates these and you find them where ever the sources were unpacked, i.e. somewhere below BuildRoot. Reminds me that when I'm back in my office in two days I'll finish up packaging Vladimirs rpm-patch tools that greatly ease handling and creating patches. Philipp -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (3)
-
Marcus Hüwe -
Philipp Thomas -
Sascha 'saigkill' Manns