All --
I've just pushed a newly built testing branch to
http://github.com/reductivelabs/puppet/tree/testing
For those of you that haven't been following the testing branch saga, a few
things to note:
* This branch will be frequently (at least once a week) rebuilt from
scratch, so git's normal "don't rewrite
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
or some variation there of. If you try to pull a new version on top of a
previous version you will likely see
merge conflicts.
* The goal of this branch is to provide a testing area for new patches that
are intended to go into master but
need a little ex{e,o}rcising first
* The testing branch is constructed by applying the branches off tickets
marked "ready for testing" on top of
master, omitting those that produce conflicts.
* The branches will be applied in a specific order, with "better" patches
migrating towards the head while respecting
dependencies.
* In addition to testing the entire branch it is possible to test a prefix
by checking out a specific earlier commit (by md5)
* When a given prefix series of patches is deemed sufficiently proven it
will be removed from the testing branch
maelstrom and permanently added to the head of master.
* In parallel, we're going to be working to clean up master with the goal of
maintaining constant 100% test passage.
* If you have code that ought to be in the testing branch:
* Make sure it's listed on a ticket
* Make sure the ticket is marked ready for testing
* If it depends on any other branches, make sure to note that fact
* Track the ticket for changes; questions, status changes (e.g. to "code
insufficient" if it causes merge conflicts) and
links to the tickets for any bugs discovered in the testing process.
The following is the list used to construct the present branch. All of them
applied cleanly except for luke:tickets/master/2954. For the next round I
need to get my futures rebased to testing, Luke needs to resolve the
problems with 2954 and indicate which of the other branches from his repo
should be included. I'll also go back through the dev list to find branches
that ought to be included (feel free to respond with any)--right off the bad
I know I want to get the hashes in here.
-- Markus
#
# Contributor repositories
#
markus=git://github.com/MarkusQ/puppet.git
luke=git://github.com/lak/puppet.git
jesse=git://github.com/jes5199/puppet.git
#
# Branches to merge into master to produce testing branch
#
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
#
#
# Luke --------------------------------
#
# Need a ticket or remove from list
#
luke:feature/master/1481-tmp
luke:feature/master/2276
luke:feature/master/event_manager
luke:feature/event_manager/resource_harness
luke:feature/event_manager/rollback
luke:feature/master/internal_dsl
luke:feature/master/push_tarball
luke:feature/master/single_executable
luke:features/master/hash2resources
luke:refactor/master/extracted_definedtype
luke:refactor/master/graph_shadowing
luke:refactor/master/no_relationship_graph
luke:test_fixes
#
#
# Brice -------------------------------
#
# * Hashes
--
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.
