Re: Error when applying hunk in Diff buffer

[Nick Roberts]

 > To reproduce:
 > 
 > C-x C-f ChangeLog RET
 > C-x v v
 > Remove a line
 > C-x v = SPC

C-x v = runs vc-diff (no SPC)

 > Move to the *vc-diff* buffer and the change you have made, then:
 > C-c C-a
 > 
 > I get a buffer read-only error.  It looks like vc is trying to use the wrong
 > buffer.  For me, the *vc-diff* buffer contains:
 > 
 > *** ChangeLog.~1.481.~       Mon Jul 17 09:47:44 2006
 > --- ChangeLog        Thu Jul 20 11:59:52 2006
 > ***************

With vc-diff I get:

*** ChangeLog   15 Jul 2006 10:13:39 +1200      1.481
--- ChangeLog   20 Jul 2006 23:16:33 +1200      
***************
...

With dired-diff I get something like you:

*** /home/nickrob/emacs/ChangeLog.~1.481.~      2006-07-15 10:13:39.000000000 
+1200
--- /home/nickrob/emacs/ChangeLog       2006-07-20 23:16:33.000000000 +1200
***************
...

Then C-c C-a gives a read-only error because ChangeLog.~1.481.~ _is_
read only and diff-apply-hunk changes the first file to the second.  So that
seems right to me.

-- 
Nick                                           http://www.inet.net.nz/~nickrob