On Dec 12, 11:50 pm, Tony Tung <[email protected]> wrote: > > 1. On May 16, 2008, I sent an email to Dustin and Dormando, having gotten > the impression that they were the de-facto maintainers of memcached, asking > how we could merge our changes back into the mainline of development. We > even offered to host a merge-athon to assist in the process. > 2. I was asked to send our tree. I did so. > 3. Upon receiving our tree, I was asked to send our changes as a series of > diffs. > 4. I broke out major bugfixes and performance improvements into separate > diffs and sent them all of them by that evening. > 5. On July 8, 2008, having not seen any of our changes merged into the > mainline, I sent a followup email asking if there were plans to merge our > changes. > 6. At the most recent hackathon, we were asked to provide a repository with > discreet changes.
We all appreciate the work you've put into this, and I don't think we've ever indicated otherwise. I don't think we need to argue too much about this (especially publicly), but between your #5 and #6 there, both of us sent you an email regarding the patch you sent named ``kitchen sink'' that was twice the size of the entire memcached codebase, replaced nearly every line everywhere, and didn't actually apply on any tree I was able to find. I'm not sure about Dormando, but today is the first I've heard from you since. > I would like to point out that our src/ subdirectory is exactly the public > memcached repository. Which public memcached repository? Without any common ancestry, no automated merges can occur. If I do a subdirectory filter I *may* be able to find a tree hash that matches a version that we've got somewhere and then reconstruct history from that, but it's kind of a lot of work, and considering I couldn't get your changes to apply in May, I doubt I'd be able to do any better today. > Finally, we're willing to host a merge-athon any time the community would > like to. We have no desire to maintain a branch of the memcached code. This would be good. Is it possible for you guys to start by building a series of changesets from a community branch (my preference would be http://github.com/dustin/memcached/tree/rewritten-bin as it's the latest I know people have been doing work on) that bring forth the essence of the work you've done?
