>> For those of you that haven't been following the testing branch saga, a few
> > things to note: > > Yah! Saga over - Markus solves world hunger.. :) > Not really, but thanks. Actually, Luke and I hashed out a reduction of scope o that rather than "solving world hunger" it's more like I brought doughnuts for the office. > * This branch will be frequently (at least once a week) rebuilt from > > scratch, so git's normal "don't rewrite > > Is it automatically constructed or manually? > Automatically, with a scaled down version of my scaled up version of Luke's rake task. > To which repos will you push it? > Hmmm. I was thinking just http://github.com/reductivelabs/puppet/tree/testing but I'm open to suggestions if this is inadequate, > history" assumptions don't apply; instead, assume that history will be > > rewritten regularly > > * Consequently, the best way to pull it is probably > > > > git branch -D testing > > git fetch origin testing > > git checkout testing > > Probably worth doing a rake task that does that. > Good point. > jesse:ticket/master/3148 > > > > luke:tickets/master/2759 > > luke:tickets/master/3015 > > luke:tickets/master/2954 # Depends on 3015 > > luke:tickets/master/1943 > > > > # > > # Branches that we may want to merge later > > # > > skip rest > > # > > # Markus ------------------------------- > > # > > # Need to be rebased on master > > # > > markus:feature/0.25.x/futures > > markus:refactor/0.25.x/string_interpolation > > Why are there 0.25.x branches and master branches together? > > Or you mean rebased/renamed? > Yeah, I meant rebased and renamed. Cheers > You too. --Markus -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
