[Buildbot-devel] #63 a duplicate..

[Brian Warner]

"Dustin J. Mitchell" <dustin at zmanda.com> writes:

> Brian, your change for bug #63 duplicates a patch in my #48.  It's great
> we both had the same idea, and for roughly the same reason, but it does
> make it a bit difficult for me to maintain my patches -- especially
> since your change duplicates the first patch in a series, meaning I have
> a lot of conflicts to resolve..
>
> Is there something I can do to help get my patches merged?  I'm happy to
> revise with any feedback..

Splitting the patches into separate tickets is the best thing I can think
of.. I pushed slave concurrency tickets back to 0.7.7 in the hopes of getting
0.7.6 out the door, and that define-slaves-as-instances patch got pushed back
along with the rest. If it had been in a separate ticket without
"concurrency" in the title, I'd have been more likely to see it.

In general your changes are really good, and I want to encourage you to keep
up the good work. We're both interested in making the same sorts of changes,
which is great. Of course, that increases the chances that we'll find
different ways to fix the same thing.. :).

I'm just looking at the web-page-refactoring patches now, trying to merge
four different approaches (your #58, my web-parts branch, my really old
web-parts branch, and the idea I just came up with this morning). If your #58
patches don't change the functionality very much I can probably apply them
and then work from there, which will probably make your life easier if you've
already applied those to your tree. I can't quite tell yet, though.. the
problem with refactoring patches is that all those adds and deletes make it
difficult to tell if there were any actual changes. When I do stuff like this
locally, I usually record one patch which rearranges but does not change
functionality (or at least that's what the comments promise). Then I put all
the behavior-changing things in a separate patch. 

Could you expand on #58 a bit? Is it purely refactoring, or are there
behavior changes too?

thanks,
 -Brian