[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

pbm trying to patch 21.1 into 21.2

From: David Combs
Subject: pbm trying to patch 21.1 into 21.2
Date: 3 Sep 2002 15:32:33 -0400


sh /david3/from_netcom-dir1/emacs-stuff/emacs-21.1-21.2.diff
  Looks like a new-style context diff.
File to patch: 

--- THAT (above) *IS* the problem:
the "Looks like ...",
then it's asking me "file to patch" -- just what
am I supposed to type in for that?

And yes, within that .diff-script, the diff that's
being called is GNU diff:

diff - GNU diffutils version 2.7

And, I couldn't find the string "File to patch"
in the .diff-script.

Just to see the options, here's a diff-call from
the script:

$DIFF -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps 
--exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-21.1/etc/SERVICE 

With these options from the diff man-page:

       -lines Show  lines  (an  integer)  lines of context.  This
              option does not specify an output format by itself;
              it  has  no effect unless it is combined with -c or
              -u.  This option is obsolete.   For  proper  opera-
              tion,  patch  typically needs at least two lines of

       -r     When comparing directories, recursively compare any
              subdirectories found.

       -c     Use the context output format.

       -p     Show which C function each change is in.

       -P     When  comparing directories, if a file appears only
              in the second directory of the  two,  treat  it  as
              present but empty in the other.

Any ideas?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]