The branch at http://github.com/reductivelabs/puppet/tree/testing doesn't seem to match what's listed here. I remember you said something about how you were recalculating the timestamps of testing commits: does that provide a way to tell how stale a testing branch is?
~Jesse On Fri, Feb 19, 2010 at 10:04 AM, Markus Roberts <[email protected]>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. > > The cached-conflict-resolution workflow has been much nicer than the the > rebasing-on-testing-midpoints mess. 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. (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 > > > 7762 examples, 17 failures, 43 pending > jesse:ticket/master/3148 (Bug fixes) succeeded: > * afffcfd Fixing #3148 Settings#without_noop when run with no noop > setting > 7763 examples, 15 failures, 43 pending > andrew:ticket/0.25.x/2805 (AIX support) succeeded: > * 5686db1 Add AIX package management support (installp&nim) > 7777 examples, 16 failures, 43 pending > luke:tickets/master/2759 (Events) succeeded: > * 447945e Moving log destination code into separate files > * 95b2429 removing never-used code > * 9a3c92f Switching transactions to callback-based events > * bd9a812 Moving Parameter utility classes into separate files > * dbafb7b Moving Ensure property into separate file > * 7f1ef2e Random code cleanup > * 7f5ad9f Adding "type" instance method to enhance Demeterness > * 02af270 Cleaning up Event creation > * e3d59e5 Reorganizing Property class to match current style > * a4be363 Moving event creation to the resource > * babf066 Changing SimpleGraph.matching_edges to expect one event > * 639c1b4 Extracting event management into a separate class > * 952a951 Adding tests for the 'report' log destination > * 792fa78 Removing unused code and adding a couple of tests > * e27ca06 Removing a redundant method in Report > * 551a92b Adding Transaction events to Transaction reports > * 03276b0 removing extraneous comment > * e9d455a Fixing file content logs > * e45e96c Failing in app/puppet if facts are not found > * 018f90a Correcting comments and making report timestamp internal > * 0539eef Adding tests for "Logging" module > * bc9c5b9 Using Logging module in main Puppet module > * 7279760 Refactoring the RAL interface to logging > * a36a0e4 Cleaning up the Log initialization code. > * e65e95d Refactoring the Change/Event/Property interface > * 4e7cc9c Solidifying the RAL/Event integration. > * 76098f9 Removing last event collection transaction code > * 3640a54 Fixing File type indentation > * ffb03c0 Adding first version of Resource::Status class > * 0da4ec2 Adding Transaction::ResourceHarness class > * 7c813ff Renaming some methods in Transaction::Change > * 33cd447 Fixing some compatibility and old tests > * ba3bdce Fixing log message when changes fail > * d10c361 Changing Transaction to use the new ResourceHarness > * 4a35ac3 ResourceHarness now doesn't check params with no 'should' > * da6e400 Fixing #2759 - reports now have complete change info > * b0ae1ee Cleaning up the report tests a bit > * 5ce8cf6 Removing mention of @changes in Transaction > * baf1440 Moving Metric management to the reports > 8007 examples, 49 failures, 44 pending > luke:tickets/master/3015 (Per Environment known resource types) succeeded: > * 18e5157 Adding []/[]= support to Parser::Resource > * 7851fe3 Fixing test structure > * 9bee2e0 Adding support for parsing ruby files > * 1501be5 Removing old, never-used DSL code > * c935104 Storing per-environment LoadedCode instances > * 60d4a5b Renaming LoadedCode to ResourceTypeCollection > * bfc06fb Adding 'known_resource_types' to Environment > * 19a791e Parser now uses Environment resource type collection > * 13caebf Moving Rails initialization to Compiler terminus > * 8f779e6 Adding helper module for finding known resource types > * 5ee0dc0 Always warning if autoloading a file fails > * aef5d90 Using the RTC helper to find the known resource types > * 8594472 Fixing callers to Parser to only pass environment > * 7868905 All non-transient parser references are gone > * 0c9f3bc Removing Interpreter class > * 67b8246 Renaming Parser::ResourceType to Resource::Type > 8031 examples, 49 failures, 44 pending > luke:tickets/master/1943 (Combine yaml & file termini) succeeded: > * 8faa895 Adding filename extension support to formats. > * 5ee0f82 Adding client and server data dirs > * 4a760b7 Fixing datadir defaults to match new standards > * ae2f021 Converting File terminus to use formats. > * 53d146e Removing unused Checksum::File terminus > * b261022 Cleaning up a test. > 8024 examples, 53 failures, 44 pending > brice:tickets/testing/2389 (Hashes) succeeded: > * 563b302 Fix #2389 - Enhance Puppet DSL with Hashes > * f81765c Raise an error when appending not a hash to a hash > * 2b7a8cb Allow adding single key to hashes > 8047 examples, 52 failures, 44 pending > luke:tickets/testing/2954 (Class parameters) succeeded: > * 9b527e9 Fixing test structure > * 7117420 Partially fixing #2954 - Adding class parameters > * 6786d1f Changing the interface of Puppet::Resource > * 98daabd Adding an environment helper > * b1dfaba Removing obsolete Settings comments and require > * b6ac363 Tuning file load order > * 90ab0db Fixing failing Environment unit tests > * c154e68 Adding parameter validation to Puppet::Resource > * d9fdc50 TypeCollection now supports namespace arrays > * a7fbc6a Allowing Environment.new to take an environment > * d6e7f7f Removing :paramcheck and :typecheck settings > * 0195e6c Adding support for class parameters > * 1855312 Removing Resource::Reference classes > * 7e4c85c Adding tmpfile cleanup to tests > * 1af325e Fixing most of the broken tests in test/ > * d5dd738 Adding strictness checking to resources > * 637aad3 Converging the Resource classes further > * 3fe1a1f Fixing type/title resource resolution > * 6a2969e Forcing parent evaluation in resource types > * 329fe98 Finishing renaming :params to :parameters internally > 8141 examples, 64 failures, 44 pending > markus:feature/testing/2956 (Futures) succeeded: > * a3bc626 Added AST shim class > * a24d92a remove Hash.collect! diagnostics and settor? dead code > * 503f5c1 instantiation, Scope#future_of, lots of plumbing > * 5c31de4 playing with nested scopes > * 36fe479 Changes to the 0.25.x based version to make it work on > testing. > * 1f21abf safeevaluate doesn't need to be passed scope > * 48fc1fa removing scope from evaluate and evaluate_match > * 5e46d67 fixing tests > 8141 examples, 159 failures, 44 pending > markus:refactor/master/3216 (String interpolation) succeeded: > * 8e81954 Moving the string interpolation parsing to the parser/lexer > 8159 examples, 158 failures, 44 pending > jesse:feature/master/3115 (REST, first installment) succeeded: > * 30cceda Feature #3115 REST-ified status() > (in /Users/markus/projects/puppet) > ran ruby ../refactor/refactor.rb: > * c9b6af7 Code smell: Miscellaneous oddity removal > * 989cf52 Code smell: Inconsistent indentation and related formatting > issues > * 01763b3 Code smell: Use {} for % notation delimiters wherever > practical > * 29eed32 Code smell: English names for special globals rather than > line-noise > * 4721d92 Code smell: Use string interpolation > * 7e68f42 Code smell: Line modifiers are preferred to one-line blocks. > * d988a85 Code smell: Booleans are first class values. > * fdb721e Code smell: Omit needless checks on defined > * f9507cc Code smell: Avoid needless decorations > * f3a7d19 Code smell: Two space indentation > (in /Users/markus/projects/puppet) > > -- > 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]<puppet-dev%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en. > -- 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.
