Re: Merging 1.1 changes to trunk

2006-05-31 Thread John Sisson
I'll do your merge. John Matt Hogstrom wrote: My comments below. Will you do the merge John or should we do it after you wave the flag ? Matt John Sisson wrote: There have been a number of changes in the 1.1 branch that haven't been merged to trunk since trunk was copied from the 1.1 branc

Re: Merging 1.1 changes to trunk

2006-05-31 Thread Matt Hogstrom
My comments below. Will you do the merge John or should we do it after you wave the flag ? Matt John Sisson wrote: There have been a number of changes in the 1.1 branch that haven't been merged to trunk since trunk was copied from the 1.1 branch in rev 409124. We should try to merge these i

Merging 1.1 changes to trunk

2006-05-31 Thread John Sisson
There have been a number of changes in the 1.1 branch that haven't been merged to trunk since trunk was copied from the 1.1 branch in rev 409124. We should try to merge these in revision order as much as possible, as there will be less chance that my svn properties fix (rev 409817) will have p