Ah, I see this is one of the messages you sent, that didn't make it to dvj.
I believe this would've answered a number of questions I had when you submitted that code review request. Added thanks for explaining your changes before I had those questions, even though the email didn't make it to me.
Since most things in this email were addressed, shall we discuss the merge-to-trunk dance?
How about we do it like this:
- You work on your branch, merging in code from the trunk as frequently as you care to
- When you're ready for your changes to be merged to trunk, do one more merge from the trunk to your branch, and send me an email.
- I'll then take your branch, and merge it into the trunk.
My reasons for doing it this way:
- By virtue of being the person that merges your code into the trunk, I'll necessarily remain familiar with 100% of the code.
- By being the trunk-merger, if anything happens to break in the trunk, it's my responsibility alone. As such, this ensures that your branch will always get a complete and detailed code review, to ensure correctness.
We can revisit this later, but for now, does that sound OK to you? Any reasons you can think of to do otherwise?
-Chris