897

[billroper]

The Merge From Hell (TM) is complete and everything compiles clean. (Testing the result is a problem for next week.)

There were 897 files that were checked out when I was done, 886 of which were different from the original baseline that I was merging to.

No wonder this took a while to complete!

Comments

[hms42]

Congratulations on finishing that piece of torture.

[billroper]

Thanks!

[catsittingstill.livejournal.com]

Congratulations; that is impressive!

[billroper]

Thanks!

[filkertom.livejournal.com]

Oh man, congrats. Sometimes it feels as if you were working on that when you met me.

[billroper]

Oh, I know. I actually started working on the locking project back in June of 2011, but it was on an older code line. Thus, the need to merge this mess...