Re: IPv6

["Roy T. Fielding" <fi...@kiwi.ICS.UCI.EDU>]

>Easy enough.  We should be applying all patches to both trees, IMHO.
>Nobody has said there will be another merge between the two trees.  Manoj
>has stated to me that another merge would not be as easy as the previous
>merges, bceause files have been moved around even more now, and patches
>have been applied to one tree or the other, or both.

Yep, we definitely won't be doing another across-the-board merge.
Individual patches should be merged forward by getting the change
(and correct log info) from the change history file for 1.3 and
manually applying it to 2.0.  Most of them have already been dual-applied.

....Roy