On Mon, Jan 28, 2013 at 6:15 PM, Alex Huang <alex.hu...@citrix.com> wrote: > I had a chat with Chip on IRC. His concerns is how does javelin merge cause > rippling effects in existing branches that are still out there and the > patches on review board. His proposal is to do the following, > > - Maintain two branches: master and javelin. > - All features that needs the Spring components merge to javelin. > - On 1/31, merge the two together. > - On merge, javelin will pull in master once again and then merge into master. > > It's a more work for the people working on javelin but it does make it easier > for everyone else so we're willing to take up that responsibility. > > --Alex
Thanks for sending that to the list Alex. I had to leave the office pretty quickly after that IRC exchange, so I appreciate you summarizing. I'm actually going to start a new thread reiterating the points for everyone in a few minutes. That being said, my concerns were focused on the logistical aspects of when and where to merge. I'm personally +1 for this plan, but others may have different opinions about merging javelin in, even with this approach. -chip
