all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: dkcombs@panix.com (David Combs)
Subject: pbm trying to patch 21.1 into 21.2
Date: 3 Sep 2002 15:32:33 -0400	[thread overview]
Message-ID: <al32oh$qpq$1@panix2.panix.com> (raw)

pwd
/myexternals/david3/from_netcom-dir1/emacs-stuff/emacs-21.1


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

--- 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 emacs-21.2/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
              context.

       -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?

Thanks

David

             reply	other threads:[~2002-09-03 19:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2002-09-03 19:32 David Combs [this message]
2002-09-03 21:52 ` pbm trying to patch 21.1 into 21.2 Kai Großjohann
2002-09-04  5:44   ` David Combs
2002-09-04 12:10     ` Kai Großjohann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='al32oh$qpq$1@panix2.panix.com' \
    --to=dkcombs@panix.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.