On 19/02/10 19:04, Markus Roberts wrote: > Today's edition of the testing branch includes a few more topic branches, > including Brice's hash implementation and the first installment of Jesse's > REST work.
Thanks for merging the hash patch. > The cached-conflict-resolution workflow has been much nicer than the the > rebasing-on-testing-midpoints mess. Did you already talk about the "cached-conflict-resolution"? > While I"ll continue to support the > three branches that have been rebased on old testing branches, any future > branches for inclusion should be based on the current head of master at the > time of their inclusion. OK. If you need any rebasing from me, let me know. > (The kicker was the problem of rebased branches > implicitly including stray bits of the patches that preceded them in the > testing branch on which they were rebased--analogous to the way dithered > pixels at the edge of a irregular figure cut and pasted from one picture to > another, and just as tedious to fix. It essentially undermines the whole > point of the testing branch by rigidly locking the branches into a > sequence.) The only exception to this policy I can foresee would be the > inclusion of rectification/unification branches specifically designed to > adjust a topic branch, which may best be based on that branch rather than on > master. I plan to explore this idea over the weekend. > > A few other notes: > > - Jesse's REST stuff prevents "rake spec" for running; it exits with an > "Environment name must be specified" error if no environment is specified > and does nothing if an environment is specified. > - While this testing branch includes Brice's hash implementation, my > futures work, and my string interpolation code they are not yet fully > integrated; the semantics of partial updates is something that we'll be > well > served to get right now, and we're currently considering the various > angles. > - The commits in each branch are now listed in the order of application, > to match the order in which the branches themselves are listed. > - The commit date for all the patches in the testing branch are set to an > arbitrary point in time earlier this week, to stabilize the SHA-1 refs; > this > will be used on all testing branches from here on > > -- Markus > > [snipped] -- Brice Figureau My Blog: http://www.masterzen.fr/ -- 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.
