Mailinglist Archive: opensuse-bugs (4859 mails)

[bugzilla_noreply@xxxxxxxxxx]

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@xxxxxxxxxx
        ReportedBy: mvyskocil@xxxxxxxxxx
         QAContact: adrian@xxxxxxxxxx
          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.