Re: [WWdevel] Lessons learned from 2.2 freeze/release

[Davide P. C. <dp...@un...>]

> The procedure I gave for committing a change to two different  
> branches is somewhat cumbersome. I found myself instead maintaining  
> two up-to-date working copies, one on rel-2-2-dev and one on MAIN,  
> and doing like this: ...

I agree with you, I used the procedure you outline for my first few  
updates, but found that I was never certain that things had been left  
the way that they were supposed to be.  So I did essentially the same  
that you did:  ran two separate versions, one a copy of MAIN and one  
a copy of the developer version.

> The rel-2-2-dev branch and the MAIN branch remained largely  
> identical, indicating that no one was doing any "new" development  
> during the freeze period. I still think it was good to start the - 
> dev branch when we did, just in case new development is taking  
> place in parallel.

Yes, I think you are right to do this.  I had considered some changes  
to the Parser that I would not want to have put into the 2.2 release  
and would have used just the MAIN branch, but just didn't have time  
to get to them.

Davide