[Simulavr-devel] Re: Patchfile trouble

[Joel Sherrill]

Klaus Rudolph wrote:
> Hi all,
>
> I could not use any of the actual send patchfiles!
>
> I have no idea which format they have! I got always terrible errors and
> I have no fun to dig deep into patch.
>
> PLEASE:
> If you have a checkout directory from simulavr make a full copy, do the
> changes in the copy and simply do a diff -ur and send only this file.
>
>
> This now costs me a lot of senseless time!
>
> If there is a special command syntax for the actual send files let me know.
>
> I will drop all bug entries, because I could not handle them if the
> files come not up correctly
>
>   
They are standard patches generated with cvs diff -u. 
This generated a "unified format" diff which can be
applied with patch.  Depending on which level in the
source tree they were generated from you
would do this to test the patch:

patch -p0 --dry-run <XXX.diff

and this to apply it if the above goes OK:

patch -p0 <XXX.diff

The -pN option specifies the number of directories
in the path specified in the patch to remove (see patch(1)).
Most/all of my patches were generated from the top
of the tree which is indicated by this type of
line at the top of README.diff

Index: examples/anacomp/README

Notice it is relative to the top of the tree.  Grrr.. I apparently
forgot the -u on the cvs diff command for README.diff.  It is
actually a context diff but should apply just the same.

The RTEMS Wiki has entries on generating and applying
patches.

http://rtems.org/wiki/index.php/ToolHints

These are VERY VERY VERY standard format patches generated
in a VERY VERY VERY standard way.  If you need help learning
how to work with them, I will be happy to teach you.  diff'ing and
patching is an essential skill in the free software world.  It is
a bit of magic but not really difficult.

Please please don't throw them away.
> Sorry for that!
>  Klaus
>
>
>   


--
Joel Sherrill, Ph.D.             Director of Research & Development
address@hidden        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
  Support Available             (256) 722-9985