On 10 February 2010 12:15, Markus Roberts <[email protected]> wrote: > 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.. :) > * 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? To which repos will you push it? > 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. > 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? Cheers James Turnbull -- Author of: * Pro Linux System Administration (http://tinyurl.com/linuxadmin) * Pulling Strings with Puppet (http://tinyurl.com/pupbook) * Pro Nagios 2.0 (http://tinyurl.com/pronagios) * Hardening Linux (http://tinyurl.com/hardeninglinux) -- 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.
