Re: another merge from 1.8

2007-02-18 Thread Neil Jerram
Kevin Ryde <[EMAIL PROTECTED]> writes: > Neil Jerram <[EMAIL PROTECTED]> writes: >> >> Anyway, does the 1.8 ChangeLog look OK now? > > Yes, but I think I changed my mind about putting it in at the orginal > date. That might make it look like it was in 1.8.0 or 1.8.1 (which it > wasn't of course).

Re: another merge from 1.8

2007-02-07 Thread Kevin Ryde
Neil Jerram <[EMAIL PROTECTED]> writes: > > Anyway, does the 1.8 ChangeLog look OK now? Yes, but I think I changed my mind about putting it in at the orginal date. That might make it look like it was in 1.8.0 or 1.8.1 (which it wasn't of course). Would you like to move it up to a current date, a

Re: another merge from 1.8

2007-02-06 Thread Neil Jerram
Kevin Ryde <[EMAIL PROTECTED]> writes: > Neil Jerram <[EMAIL PROTECTED]> 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,

Re: another merge from 1.8

2007-01-29 Thread Kevin Ryde
Neil Jerram <[EMAIL PROTECTED]> writes: > > One detail of the merging... I gather we're preferring to merge > ChangeLog fragments directly, so as to minimize the diffs between the > ChangeLogs in two branches, Yep. > This seems fine to me, but it does mean we lose info about when the > change wa

Re: another merge from 1.8

2007-01-28 Thread Neil Jerram
Kevin Ryde <[EMAIL PROTECTED]> writes: > Neil Jerram <[EMAIL PROTECTED]> writes: [about an IA64 HP-UX fix...] >> Have you already done the merge of these changes to 1.8, > > No. > >> or should I do that? > > Yes please. I've done this now. One detail of the merging... I gather we're preferrin

Re: another merge from 1.8

2007-01-18 Thread Kevin Ryde
Neil Jerram <[EMAIL PROTECTED]> writes: > > From some outstanding reports, I'm not sure this area is fully > correct yet, Yep. As long as it's not going backwards of course :). > Have you already done the merge of these changes to 1.8, No. > or should I do that? Yes please. >> * Is the readl

Re: another merge from 1.8

2007-01-17 Thread Neil Jerram
Kevin Ryde <[EMAIL PROTECTED]> writes: > * Are the hpux ia64 bits meant to be in 1.8? If it's a portability > matter then it ought to be applicable. Yes, they should be in 1.8. From some outstanding reports, I'm not sure this area is fully correct yet, but it makes sense to do it in 1.8 and t

Re: another merge from 1.8

2007-01-16 Thread Ludovic Courtès
Hi, Kevin Ryde <[EMAIL PROTECTED]> writes: > * If it's going to be utf-8 for the changelogs then please make that > change in 1.8 too or merges are going to go haywire. Agreed. I was planning to switch to UTF-8 also in 1.8 at some point. (I don't know much about the other issues you brought