On Oct 19, 6:21 am, "Toru Maesaka" <[EMAIL PROTECTED]> wrote: > Hi guys, > > I fixed the stats opaque issue pointed out by Dustin's test case at > the hackathon and just pushed it to github: > > http://github.com/tmaesaka/memcached/commit/86159eb7b5c611d25a33eb1cb...
Great, that's some code I can remove, then. :) > Oh, and I noticed that Dustin had merged my binary tree and there is > something I feel really guilty about... Some pushes I made to my tree > were done manually to bring over 1.2.6/1.2.7 stable patches into the > binary tree. This is probably going to hit us badly when merging other > trees even with the same ancestor (e.g. > brad'shttp://github.com/bradfitz/memcached/commits/incr_fix). > > Theres probably a way to fix this but I'm not quite a git ninja yet... > Does anyone have any thoughts/solution for this? Generally git will just do the right thing here. I just tried a merge against dormando/stable and it made a pretty big mess, though. Part of that may be because of the svn stuff that went on. At some point, we need to put it all together. I'm not going to worry about it too much, though. It will settle down fairly shortly and we can work on keeping the tree a bit cleaner after that merge.
