[haiku-bugs] Re: [Haiku] #9490: A 20KB+ Patch containing codestyle fixes for any part of the system
- From: "mmadia" <trac@xxxxxxxxxxxx>
- Date: Sun, 10 Mar 2013 18:32:42 -0000
#9490: A 20KB+ Patch containing codestyle fixes for any part of the system
---------------------------+----------------------------
Reporter: mmadia | Owner: nobody
Type: enhancement | Status: new
Priority: normal | Milestone: R1
Component: - General | Version: R1/Development
Resolution: | Keywords:
Blocked By: | Blocking:
Has a Patch: 1 | Platform: All
---------------------------+----------------------------
Comment (by mmadia):
Thanks for following up! The git format-patch will allow your name and
email address to show up in the commit logs as the author (as opposed to
the person who commits it to Haiku's repository). For example, hrev45330
is an example of committing a diff made with git format-patch. Another
example is having the real author show up on statistic sites, like
http://www.ohloh.net/p/haiku
Also, some parts don't apply cleanly to the current codebase.
{{{
/use-the-source/haiku> patch -p1 -i white-space-removed.diff --dry-run
patching file src/servers/index/CatchUpManager.cpp
patching file src/servers/index/IndexServer.cpp
patching file src/system/kernel/arch/arm/arch_debug.cpp
patching file src/system/kernel/arch/arm/arch_elf.cpp
Hunk #1 FAILED at 34.
1 out of 1 hunk FAILED -- saving rejects to file
src/system/kernel/arch/arm/arch_elf.cpp.rej
patching file src/system/kernel/arch/arm/arch_int.cpp
Hunk #2 succeeded at 163 with fuzz 1.
Hunk #3 FAILED at 190.
Hunk #4 FAILED at 288.
2 out of 4 hunks FAILED -- saving rejects to file
src/system/kernel/arch/arm/arch_int.cpp.rej
patching file src/system/kernel/arch/arm/arch_timer.cpp
patching file src/system/kernel/arch/arm/arch_uart_8250.cpp
patching file src/system/kernel/arch/arm/arch_uart_pl011.cpp
patching file src/system/kernel/arch/arm/arch_vm_translation_map.cpp
patching file src/system/kernel/arch/arm/paging/ARMPagingMethod.h
patching file src/system/kernel/arch/generic/debug_uart_8250.cpp
patching file
src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp
patching file src/tests/add-
ons/index_server/fulltext_search/BeaconSearcher.h
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file src/tests/add-
ons/index_server/fulltext_search/BeaconSearcher.h.rej
patching file src/tests/add-
ons/kernel/bus_managers/agp_gart/gart_tester.cpp
patching file src/tests/add-ons/kernel/busses/scsi/example/example_scsi.c
patching file src/tests/add-ons/kernel/drivers/tty/tty-test.cpp
}}}
I'm guessing a `git pull --rebase` is needed before generating the patch?
--
Ticket URL: <http://dev.haiku-os.org/ticket/9490#comment:4>
Haiku <http://dev.haiku-os.org>
Haiku - the operating system.
Other related posts:
