[Bug 650476] New: osc diff produces incorrect patches
https://bugzilla.novell.com/show_bug.cgi?id=650476 https://bugzilla.novell.com/show_bug.cgi?id=650476#c0 Summary: osc diff produces incorrect patches Classification: openSUSE Product: openSUSE.org Version: unspecified Platform: Other OS/Version: Other Status: NEW Severity: Major Priority: P5 - None Component: BuildService AssignedTo: adrian@novell.com ReportedBy: mvyskocil@novell.com QAContact: adrian@novell.com Found By: Development Blocker: --- Created an attachment (id=397983) --> (http://bugzilla.novell.com/attachment.cgi?id=397983) The incorrect and incomplete patch generated by iosc diff The command osc diff produces incorrect and incomplete patches with weird (14 more lines skipped) string. Example iosc diff -r6:9 home:mvyskocil:branches:SUSE:Factory:Head/java-1_6_0-ibm ---snip--- %files jdbc -f %{name}-%{version}-jdbc.files %defattr(-,root,root,-) -%ifarch %ix86 ppc -%files plugin (14 more lines skipped) Index: java-1_6_0-ibm.changes ---snip--- patch --input=../../home:mvyskocil:branches:SUSE:Factory:Head/java-1_6_0-ibm/.osc/bnc649241.patch patching file java-1_6_0-ibm.spec Hunk #4 FAILED at 51. patch: **** malformed patch at line 203: (14 more lines skipped) The correct patch can be generated by twice iosc cat and a diff -u. -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=650476 https://bugzilla.novell.com/show_bug.cgi?id=650476#c1 --- Comment #1 from Michal Vyskocil <mvyskocil@novell.com> 2010-11-01 15:01:42 UTC --- Created an attachment (id=397985) --> (http://bugzilla.novell.com/attachment.cgi?id=397985) The manually generated correct patch iosc cat home:mvyskocil:branches:SUSE:Factory:Head/java-1_6_0-ibm -r9 java-1_6_0-ibm.spec > java-1_6_0-ibm.spec.r9 iosc cat home:mvyskocil:branches:SUSE:Factory:Head/java-1_6_0-ibm -r6 java-1_6_0-ibm.spec > java-1_6_0-ibm.spec.r6 diff -u java-1_6_0-ibm.spec.r{6,9} -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=650476 https://bugzilla.novell.com/show_bug.cgi?id=650476#c2 --- Comment #2 from Michal Vyskocil <mvyskocil@novell.com> 2010-11-01 15:03:05 UTC --- As very important and annoying for me is the osc diff generate valid diff before commit, but afterward it adds the (xy more lines skipped), which makes this feature completely unusable. -- 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.
https://bugzilla.novell.com/show_bug.cgi?id=650476 https://bugzilla.novell.com/show_bug.cgi?id=650476#c3 Sascha Peilicke <speilicke@novell.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |speilicke@novell.com Resolution| |DUPLICATE --- Comment #3 from Sascha Peilicke <speilicke@novell.com> 2010-11-04 09:22:38 UTC --- Probably the same as #518304 *** This bug has been marked as a duplicate of bug 518304 *** http://bugzilla.novell.com/show_bug.cgi?id=518304 -- 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.
participants (1)
-
bugzilla_noreply＠novell.com