> This patch is still problematic. There is a consensus to use
> native line endings w/SVN and svn diff's handle this cleanly,
> your's will mess up the line endings.
Oops, that's new to me. How is the output from "svn diff"
different:
/usr/src/sdkcradle/openocd$ svn diff src/target/mips_m4k.c
Index: src/target/mips_m4k.c
===================================================================
--- src/target/mips_m4k.c (revision 1374)
+++ src/target/mips_m4k.c (working copy)
@@ -93,7 +93,7 @@
int mips_m4k_examine_debug_reason(target_t *target)
{
- int break_status;
+ u32 break_status;
int retval;
if ((target->debug_reason != DBG_REASON_DBGRQ)
to what quilt outputs:
--- openocd.orig/src/target/mips_m4k.c
+++ openocd/src/target/mips_m4k.c
@@ -93,7 +93,7 @@
int mips_m4k_examine_debug_reason(target_t *target)
{
- int break_status;
+ u32 break_status;
int retval;
if ((target->debug_reason != DBG_REASON_DBGRQ)
On my system I haven't found any difference, not even with "svn
diff >a" and then locking for CR there (it has only LFs).
There's just a difference in the heading of the patch, but not
in the hunk itself (the thing including and following the "@@").
> Even in 2009 line endings are causing grief. Geeez.... trying
> to fix line endings is a bit of a quixotic task...
I have to admit that I only know a tiny bit about svn property
eol:line-style.
>From what I get from
http://svnbook.red-bean.com/en/1.4/svn.advanced.props.file-portability.html,
any file which has the eol:line-style "native" property should
be simply patchable and committable. All files that my patch
modified have this property. So I'm puzzled.
Maybe (a big maybe!) you're on Windows and got my attachment,
which contained Linux-LF-Line-Endings and your
windows-"patch"-command was not expecting this and messing
things up.
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development