Re: [Quilt-dev] Strange problem when applying and refreshing a patch

[Ozan Çağlayan]

Andreas Gruenbacher wrote On 12-05-2009 00:19:
>
> So is this good or bad, and what do you think quilt is doing wrong?
>   
Actually it's really hard to explain the problem over here, but I'll try
to create a test case:

* The patch actually contains 6 commits to the same file, a total of 19K,
* I'm applying it on my kernel tree using quilt push, and there's a tiny
conflict which avoids the patch from applying,
* I'm applying it with quilt push -f, all the hunks except the
conflicting one applies well,

At that point, everything is fine, quilt diff -z is null as expected.

* I edit the patch using quilt edit, and then resolve the conflict. BTW,
the conflicting part is only a 5-line addition, no deletion is available.
* quilt diff -z shows the 5-line addition as expected:

Index: linux-2.6.25/drivers/net/r8169.c
===================================================================
--- linux-2.6.25.orig/drivers/net/r8169.c
+++ linux-2.6.25/drivers/net/r8169.c
@@ -515,6 +515,11 @@ static int rtl8169_poll(struct napi_stru
 static const unsigned int rtl8169_rx_config =
        (RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST <<
RxCfgDMAShift);

+static void mdio_patch(void __iomem *ioaddr, int reg_addr, int value)
+{
+       mdio_write(ioaddr, reg_addr, mdio_read(ioaddr, reg_addr) | value);
+}
+
 static void mdio_write(void __iomem *ioaddr, int reg_addr, int value)
 {
        int i;

-----------------

Now I have the original patch -> 19K [0]
An unapplied modification of 5 lines over that patch [Seen above]

I refresh the patch, and then the whole patch is garbled in a way that I
can't see any logic, the size is reduced to 15K, the patch is completely
invalid [1]

I really want to help in understanding what's going on. If it's possible
to discuss it on IRC, I think the resolution will be much more fast, but
I couldn't find you in any channel :)

[0]:http://cekirdek.pardus.org.tr/~ozan/quilt/r8169-several-fixes-and-new-phys.patch_original
[1]:http://cekirdek.pardus.org.tr/~ozan/quilt/r8169-several-fixes-and-new-phys.patch_refreshed

Thanks,
Ozan Caglayan