Re: another merge from 1.8

[Neil Jerram]

Kevin Ryde <address@hidden> writes:

> Neil Jerram <address@hidden> writes:
>>
>> I also had to specify a new encoding for the 1.8 ChangeLogs,
>
> Is that when you let emacs do a merge or update?  The same happened to
> me and it offered some strange diffs.  Ludovic put the right local
> var, but I suspect emacs doesn't look at it on the first C-x v v that
> brings it into the working copy.

Yes, it was when I used emacs to copy a chunk of ChangeLog from HEAD
to 1.8.  (I would have been using Ediff to look at the diffs; not sure
whether I was able to use Ediff's copy-across function, or if I had to
do the cut and paste by hand.)

(I'm not sure if your point about C-x v v is relevant, because that's
not a binding that I use.  I prefer the PCL-CVS interface.)

Anyway, does the 1.8 ChangeLog look OK now?

Regards,
     Neil