[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Error when applying hunk in Diff buffer
From: |
Marshall, Simon |
Subject: |
RE: Error when applying hunk in Diff buffer |
Date: |
Mon, 24 Jul 2006 10:18:42 +0100 |
> > Or maybe diff-mode should be able to cope with a diff like this:
> > [...]
> > And DTRT?
>
> Yes, maybe diff-mode could use some heuristic to decide which
> of the two file names should be used. Maybe if one of the
> two is a backup files (with the ~ at the end) or if one of
> the two is read-only, then the default should be to apply the
> hunk to the other...
>
> But to tell you the truth, I think there's already too much
> heuristic involved in diff-mode's selection of the file,
> place, and direction of the hunk application. So it's
> probably better to get used to telling Emacs what you mean,
> rather than let Emacs figure out that you meant something
> else than what you said.
I understand what you're saying from a developer's perspective, but I raised
this as a user from a user's perspective. I have (AFAIK) always been able
to do C-x v = and C-c C-a (or frequently their menu entries) and emacs
happily DTRT.
Now I find it does not work, barfing about a buffer I didn't open that is
visiting a file I didn't create. See what I mean?
And there is nothing (even in NEWS---assuming a user would look in it) to
tell me to set vc-stay-local to nil or do C-u C-c C-a (which does not have a
menu-only entry) to make it work.
Simon.
- Error when applying hunk in Diff buffer, Marshall, Simon, 2006/07/20
- RE: Error when applying hunk in Diff buffer, Marshall, Simon, 2006/07/20
- RE: Error when applying hunk in Diff buffer, Marshall, Simon, 2006/07/20
- RE: Error when applying hunk in Diff buffer, Marshall, Simon, 2006/07/21
- RE: Error when applying hunk in Diff buffer,
Marshall, Simon <=