Re: Merging multitty

[Jason Rumney]

David Kastrup wrote:
> However, I think we more or less agreed that it would be more prudent
> to merge the multitty stuff first and follow up with the Unicode
> branch, since that would minimize the merge work on multitty where we
> have less active expertise to rely on.
>   
I don't recall ever agreeing this, although you have asserted so 
numerous times over the last few weeks.

The merge between multitty and unicode will be the same, whichever order 
it is done in.
The simple fact is that emacs-unicode-2 is ready to go onto the trunk, 
and the multitty is not due to issues mentioned in the README on 
Karoly's website.

> In either case, a merge into trunk is quite a bit of work.
>   

I think in both cases, the branches are well synched with trunk already, 
so there should be very little work in moving either one of the branches 
to the trunk (though in the case of multitty it would break Emacs on 
some platforms). The work comes when the non-merged branch is next 
synched to the trunk. The conflicts will be the same whichever direction 
the merge happens in, so I don't see any compelling reason to hasten the 
multitty merge to trunk (but it should be checked in on a branch ASAP so 
the problems mentioned above can be worked on by someone who is familiar 
with the platforms affected).

Your point that Karoly is not going to be available for much longer is a 
point against merging into trunk quickly IMHO. Either someone else will 
step forward to maintain that code, in which case it doesn't matter if 
the merge to trunk happens later, or noone wants to maintain the 
multitty code, in which case merging into trunk would be a mistake.