[OpenWrt-Devel] [PATCH 1/3] [ubox] validate: fix indentation

[John Crispin]

On 29/06/2014 12:38, Jonas Gorski wrote:
> On Sun, Jun 29, 2014 at 8:58 AM, John Crispin <john at phrozen.org>
> wrote:
>> Hi,
>> 
>> blogic at debian:/openwrt/ubox$ git am 5748 Applying: validate: fix
>> indentation blogic at debian:/openwrt/ubox$ git am 5749 Applying:
>> validate: fix indentation
> 
> They have both the same subject, so you quite likely downloaded
> the same patch twice.
> 
> Assuming the numbers are the patchwork patch ids, 5749 should be 
> "validate: add valid bool types enabled/disabled"
> 
>> error: patch failed: validate/validate.c:882 error:
>> validate/validate.c: patch does not apply Patch failed at 0001
>> validate: fix indentation When you have resolved this problem run
>> "git am --resolved". If you would prefer to skip this patch,
>> instead run "git am --skip". To restore the original branch and
>> stop patching run "git am --abort". blogic at debian:/openwrt/ubox$
>> git am --abort blogic at debian:/openwrt/ubox$ patch -p1 < 5749 
>> patching file validate/validate.c Reversed (or previously
>> applied) patch detected!  Assume -R? [n] n Apply anyway? [n] y 
>> Hunk #1 FAILED at 882. 1 out of 1 hunk FAILED -- saving rejects
>> to file validate/validate.c.rej
> 
> Which would also perfectly explain this.
> 
> 

let me check the bash_history ... and indeed i fat fingered this while
doing copy pasta :)




> Jonas _______________________________________________ openwrt-devel
> mailing list openwrt-devel at lists.openwrt.org 
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel