[PATCH] diff: rewrite V3. -1300 bytes

Denys Vlasenko vda.linux at googlemail.com
Sun Jan 17 05:12:33 UTC 2010


On Sunday 17 January 2010 06:06, Denys Vlasenko wrote:
> On Sunday 17 January 2010 05:44, Denys Vlasenko wrote:
> > I see much bigger degradation. I diff Linux kernel trees
> > (you can easify find tarballs with these exact versions on kernel.org,
> > if you want to reproduce):
> > 
> > Old bbox diff:
> > 
> > # time busybox.t4/busybox diff -urpN linux-2.6.32.3 linux-2.6.33-rc4 >z4.diff
> > real    0m14.417s
> > user    0m11.603s
> > sys     0m2.784s
> > 
> > New bbox diff:
> > 
> > # time busybox.t5/busybox diff -urpN linux-2.6.32.3 linux-2.6.33-rc4 >z5.diff
> > real    0m40.491s
> > user    0m26.195s
> > sys     0m14.274s
> > 
> > It's not only much slower, but it also produces much bigger diff:
> > z4.diff is 49328K
> > z5.diff is 72161K
> 
> Well. It is worse than that. The produced patch is broken,
> it does not apply cleanly to linux-2.6.32.3:
> 
> # patch -p1 <../z5.diff --dry-run
> patching file .gitignore
> patching file Documentation/ABI/stable/sysfs-driver-usb-usbtmc
> patching file Documentation/ABI/testing/procfs-diskstats
> patching file Documentation/ABI/testing/sysfs-block
> patching file Documentation/ABI/testing/sysfs-bus-usb
> patching file Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
> patching file Documentation/ABI/testing/sysfs-devices-memory
> patching file Documentation/ABI/testing/sysfs-devices-system-cpu
> patching file Documentation/ABI/testing/sysfs-kernel-slab
> patching file Documentation/ABI/testing/sysfs-ocfs2
> patching file Documentation/DMA-mapping.txt
> patching file Documentation/DocBook/Makefile
> patching file Documentation/DocBook/device-drivers.tmpl
> patching file Documentation/DocBook/dvb/dvbapi.xml
> patching file Documentation/DocBook/dvb/frontend.xml
> patching file Documentation/DocBook/dvb/frontend.xml
> patching file Documentation/DocBook/dvb/isdbt.xml
> patching file Documentation/DocBook/genericirq.tmpl
> patching file Documentation/DocBook/kernel-hacking.tmpl
> patching file Documentation/DocBook/media-entities.tmpl
> patching file Documentation/DocBook/media-indices.tmpl
> patching file Documentation/DocBook/mtdnand.tmpl
> patching file Documentation/DocBook/rapidio.tmpl
> Reversed (or previously applied) patch detected!  Assume -R? [n]

Looks like trouble with files which were deleted:

--- linux-2.6.32.3/Documentation/DocBook/procfs-guide.tmpl      Thu Jan  7 00:07:45 2010
+++ linux-2.6.33-rc4/Documentation/DocBook/rapidio.tmpl Wed Jan 13 06:15:00 2010

It was

--- linux-2.6.32.3/Documentation/DocBook/procfs-guide.tmpl      Thu Jan  7 00:07:45 2010
+++ /dev/null   Thu Jan  1 01:00:00 1970
@@ -1,626 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-       "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY procfsexample SYSTEM "procfs_example.xml">
-]>
-
-<book id="LKProcfsGuide">
...


with old diff.

--
vda


More information about the busybox mailing list