unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Andre Spiegel <spiegel@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: diff-apply-hunk broken
Date: Tue, 30 Mar 2004 16:56:06 +0200	[thread overview]
Message-ID: <1080658566.29736.101.camel@localhost> (raw)
In-Reply-To: <m11xnbhht3.fsf-monnier+emacs@empanada.iro.umontreal.ca>

On Mon, 2004-03-29 at 16:19, Stefan Monnier wrote:

> Actually, no: the remote diff has some extra lines before the diff itself.
> At least with CVS it does.  But: why do you care?

I find it valuable feedback when I can see at a glance whether a diff
was computed locally or remotely.  A simple example where it might help
is this: A user makes a mistake setting up his vc-cvs-stay-local
variable.  As a result, he gets remote diffs when he actually wants them
to be local.  If he can't tell from the output what happened, it might
be difficult for him to realize the problem.

But if the disply is still different anyway, that's enough of a visual
clue I think.

> > Second, I couldn't find documentation for the "-L" option in the GNU
> > diff manual, although it is quite happy with that option (--label, which
> > seems equivalent, is documented).
> 
> The manpage definitely mentions -L as does `diff --help'.

What version are you referring to?  In GNU diffutils 2.8.1-6 (Debian
unstable), diff -L is neither mentioned in the manpage, the info manual,
nor diff --help.  The -L option is mentioned, however, for diff3 (in all
three places).  As far as I can tell, 2.8.1 is the most recent version. 
Please confirm whether you have a version where diff -L is documented. 
Otherwise, I'll file a bug report to the diffutil guys.

  reply	other threads:[~2004-03-30 14:56 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-25 17:32 diff-apply-hunk broken Sam Steingold
2004-03-25 17:48 ` Stefan Monnier
2004-03-28 22:46   ` Stefan Monnier
2004-03-29  8:10     ` Andre Spiegel
2004-03-29 14:19       ` Stefan Monnier
2004-03-30 14:56         ` Andre Spiegel [this message]
2004-03-30 23:28           ` Stefan Monnier
2004-03-31 23:08             ` Miles Bader
2004-04-01  6:12               ` Eli Zaretskii
2004-04-01 20:36                 ` Miles Bader
2004-04-01 23:41                 ` Paul Eggert
2004-04-02  7:32                   ` Eli Zaretskii
2004-04-02 23:56                     ` Paul Eggert
2004-04-03  0:45                       ` Stefan Monnier
2004-04-03  1:43                         ` Paul Eggert
2004-04-03  1:48                           ` Stefan Monnier
2004-04-03  6:47                             ` Paul Eggert
2004-04-08  4:23                               ` Juri Linkov
2004-03-25 21:53 ` Juri Linkov
2004-03-25 22:38   ` Sam Steingold
2004-03-27  5:53     ` Richard Stallman
2004-03-26  0:26   ` Kim F. Storm

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

  List information: https://www.gnu.org/software/emacs/

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

  git send-email \
    --in-reply-to=1080658566.29736.101.camel@localhost \
    --to=spiegel@gnu.org \
    --cc=emacs-devel@gnu.org \
    /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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).