On Mar 17, 2010, at 6:25 PM, Markus Roberts wrote:
Second, it's pretty clear that a lot of the failures are my fault -
each of my three primary branches seems to cause 10+ new errors.
What's the best plan to work on these? Rebase them on current
master and just fix everything I can? Or should we make a new
"testfix" branch fixes most of the failures in master and only then
start on our other failures?
Most of them are turning out to result from merge conflict
resolution problems--or rather, merge conflict detection problems.
For example, if one topic branch changes all occurrences of
Puppet::Foo::Bar.do_it(:stuff => 'goo') to
Puppet::FooBar.does_it('goo') and another topic branch adds a new
occurrence of Puppet::Foo::Bar.do_it(:stuff => 'goo') to code that
the first topic branch never touched, there will be a problem
combining them even though git will not detect a conflict.
I've got a system for working through these, and am doing so.
That sounds like a Turing-completeness problem, so, um, let me know
how that goes. :)
Lastly, the futures branch is obviously still throwing a heckuva lot
of failures. Is it actually functional yet? That is, does Puppet
actually work with it merged in and these are just broken tests, or
are they actually indicative of real problems?
This is mostly a consequence of the same sort of problems described
above writ large. I think I understand most of the problems and
know roughly what to do about them, but just need to work through
it. Next version of testing should have even few test failures,
yadda yadda, lather, rinse, repeat. I think the shortest path is to
just do it, so that's what I'm attempting to do,
So... does it actually work?
--
Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are, by
definition, not smart enough to debug it.
-- (attributed to) Brian W. Kernighan (unconfirmed)
---------------------------------------------------------------------
Luke Kanies -|- http://reductivelabs.com -|- +1(615)594-8199
--
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.
