Ideally, the merge is performed in subversion. Earlier I noted that that gives a large number of document and tree conflicts. I do not have time to resolve them.
If no team member picks this task up, a patch from Glenn is a good alternative solution. Glenn, can you attach it to the Bugzilla report? Can you indicate how you proceeded, and how you guarantee that the patch has the same result as a merge in Subversion? Simon Pepping On Sat, Oct 29, 2011 at 09:02:42AM +0800, Glenn Adams wrote: > Let me know how I may most expeditiously accomplish this work. In the mean > time, I will prepare a patch against trunk from the Temp_CS branch, which I > imagine Simon will be the one to apply. > > G. >