On Wed, Jul 25, 2012 at 8:28 AM, Massimo Lusetti <[email protected]> wrote: > On Wed, Jul 25, 2012 at 5:18 PM, Howard Lewis Ship <[email protected]> wrote: > >> I'm fine with changes occuring in master; I'm hoping to merge back >> into master in another couple of weeks. > > Nice... > >> With Tapestry's fine granularity, it is likely that changes in my >> branch will not intersect changes for other localized changes. > > My main concern are tests converted to spock while still in > groovy/testng in the master...
There's a few cases where I've converted tests from .java to .groovy, but I don't have any conversions from TestNG to Spock/Geb. > >> Things are very unstable in the 5.4-js-rewrite branch; tests fail, >> etc. It was still a conscious choice to use a feature branch for these >> changes, even knowing that I may have a difficult merge ahead. In >> general, I don't do that. > > BTW do you think we should come up with a default/official workflow > for working on the source tree? Mostly, avoid feature branches :-) > > Cheers > -- > Massimo > http://meridio.blogspot.com > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > -- Howard M. Lewis Ship Creator of Apache Tapestry The source for Tapestry training, mentoring and support. Contact me to learn how I can get you up and productive in Tapestry fast! (971) 678-5210 http://howardlewisship.com --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
