[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-patch] [BUG?] rename patch accepted with --dry-run, rejected withou
From: |
Jonathan Nieder |
Subject: |
[bug-patch] [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c) |
Date: |
Fri, 3 Sep 2010 13:43:51 -0500 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
(+cc: bug-patch)
Hi,
Uwe Kleine-König wrote:
> On Fri, Sep 03, 2010 at 07:18:43PM +0900, Magnus Damm wrote:
>> Using --dry-run is fine, but omitting dry-run gives me:
>>
>> ...
>> patching file arch/arm/common/clkdev.c
>> patching file arch/sh/include/asm/clkdev.h
>> Hunk #1 FAILED at 1.
>> Hunk #2 FAILED at 11.
>> 2 out of 2 hunks FAILED -- saving rejects to file
>> arch/sh/include/asm/clkdev.h.rej
>>
>> I guess this is caused by the last "renaming" hunk, see below.
Yep, I can reproduce this. Patch applies with "git apply",
"patch --dry-run -p1" accepts it, "patch -p1" fails.
$ patch --version | head -1
GNU patch 2.6.1.85-423d
$ cd ~/src/linux-2.6
$ git checkout 2bfc96a12
$ git clean -fd
$ wget http://download.gmane.org/gmane.linux.ports.sh.devel/8747/8748
$ patch -p1 --quiet --dry-run <8748
$ echo $?
0
$ patch -p1 --quiet <8748
2 out of 2 hunks FAILED -- saving rejects to file include/linux/clkdev.h.rej
$ echo $?
1
Andreas: ideas?
- [bug-patch] [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c),
Jonathan Nieder <=
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/03
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Uwe Kleine-König, 2010/09/03
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Schwab, 2010/09/03
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/03
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/04
[bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Matthieu Moy, 2010/09/03