> On Tue, Apr 10, 2012 at 11:01 PM, Aaron Stone <[email protected]> wrote: > > On Tue, Apr 10, 2012 at 10:45 PM, Dustin <[email protected]> wrote: > >> > >> On Sunday, April 8, 2012 10:53:53 PM UTC-7, Aaron Stone wrote: > >> > >>> git cherry reported 443 changesets between master and merge-wip. The first > >>> few changesets came back as "Already up-to-date." I ran through the rest > >>> thusly: > >>> > >>> for i in $(git cherry master | cut -f2 -d\ ); do > >>> echo $i; > >>> git merge -Xpatience -Xrename-threshold=100 $i; > >>> if [ $? -ne 0 ]; then > >>> echo "STOPPED AT $i"; > >>> break; > >>> fi; > >>> done > >>> > >>> They all came back clear. So... ??? Ship it! > >> > >> > >> > >> Really? I guess that's possible. I didn't expect it to be that far > >> behind, but do you have this somewhere I can see it? > > > > It also didn't "do" anything; no commits resulted from running that command. > > If the engine merge branch actually has all relevant code from master, > could we begin releasing memcached 1.4 versions from a memcached14 > branch, and merge engine to master?
It doesn't yet. I'm not sure what happened when you attempted that merge? I modified the core all over.
