From: Andre Spiegel <spiegel@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: diff-apply-hunk broken
Date: Mon, 29 Mar 2004 10:10:57 +0200 [thread overview]
Message-ID: <1080547857.5425.676.camel@localhost> (raw)
In-Reply-To: <m17jx4mw0b.fsf-monnier+emacs@empanada.iro.umontreal.ca>
On Mon, 2004-03-29 at 00:46, Stefan Monnier wrote:
> > In your case, clearly the new behavior is undesirable, so I think we need
> > to fix VC so that the diff doesn't mention io.d.~1.204.~.
>
> I've just installed such a change in vc.el.
> Please try it and tell me how you like it,
Looks good to me. Two questions, though: a local diff and a remote diff
now look exactly the same in the buffer. Perhaps it would be good to
add something like "(local)" after the version number, in a way that
wouldn't confuse diff-mode (or patch, for that matter)? Just a thought.
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). Do you have any idea about the
general availability of -L in other diff implementations?
next prev parent reply other threads:[~2004-03-29 8:10 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 [this message]
2004-03-29 14:19 ` Stefan Monnier
2004-03-30 14:56 ` Andre Spiegel
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1080547857.5425.676.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 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.