Comment 8 for bug 846359

Hi there.

You're seeing a conflict caused by other patches touching the gcode source.
These were merged in after I made my series. I'm attaching a new series that's
rebased on top of the new code (on top of the master branch in fact).

In looking at this again I discovered that the unit tests were badly broken and
had several bugs in them that prevented them from testing anything at all. I
fixed these and made the g-code tests work. There are some other tests that fail
now, but I haven't looked at them. To be clear, I didn't cause the failures;
rather I fixed the tests that made apparent the failures that were already
there.

The gcode patches and the unit-testing patches live together in the series I'm
attaching. It might make sense to evaluate them separately, but it should all be
good.