# This is an example commandline used to build a patch

diff -r -N -u --exclude 'aclocal.m4' --exclude 'autom4te.cache' --exclude 'Makefile.in' --exclude 'configure' --exclude '*~' --exclude '*.orig' ORIGINAL_ROSE MODIFIED_ROSE > ROSE_Changes.patch

or for more context:

diff -r -N -U 10 --exclude 'aclocal.m4' --exclude 'autom4te.cache' --exclude 'Makefile.in' --exclude 'configure' --exclude '*~' --exclude '*.orig' ORIGINAL_ROSE MODIFIED_ROSE > ROSE_Changes.patch

Note that "-N" will support addition of any new files from the patch.

To remove all ~ files use:

find . -name \*~ | xargs rm

# And to apply the patch (patches are usually built from the parent of the

# ROSE directory, this effects the number provided to the -p option):

patch -p1 < ROSE_Changes.patch

tux212.llnl.gov{dquinlan}1470: patch -p1 < RamasChanges.patch

patching file src/backend/unparser/unparse_expr.C

Hunk #1 FAILED at 1832.

Hunk #2 FAILED at 1851.

Hunk #3 FAILED at 1868.

Hunk #4 FAILED at 1877.

4 out of 4 hunks FAILED -- saving rejects to file src/backend/unparser/unparse_expr.C.rej

patching file src/frontend/EDG/EDG_3.3/src/disp/il_alloc.c

patching file src/frontend/EDG/EDG_3.3/src/disp/literals.c

patching file src/frontend/EDG/EDG_3.3/src/il_alloc.c

patching file src/frontend/EDG/EDG_3.3/src/il_def.h

patching file src/frontend/EDG/EDG_3.3/src/literals.c

patching file src/frontend/EDG_SAGE_Connection/sage_il_to_str.C

Hunk #1 succeeded at 3985 (offset 53 lines).

Hunk #3 succeeded at 7184 (offset 65 lines).

patching file src/ROSETTA/src/expression.C

Hunk #1 succeeded at 776 (offset 3 lines).

tux212.llnl.gov{dquinlan}1471: