On Wed, Nov 21, 2007 at 06:37:17AM -0500, Ken Murchison wrote: > Bron Gondwana wrote: >> On Wed, 21 Nov 2007 07:40:21 +0100 (CET), "Simon Matter" >> <simon.matter@xxxxxxxxx> said: >>> Hi Bron, >>> >>> Did you consider this one >>> http://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3006 in the patch above? >>> From a quick look it seems both patches conflict, is #3006 obsolete now? >> You're right, they probably do conflict and Ken has applied 3006. I >> should >> have checked on that. Hmm... >> Actually, my patch doesn't even fix #3006. It does sort of suck to be >> working >> from a stable past point rather than the latest CVS actually when I do >> these >> patches - though it's nice from a stability point of view. >> OK - Ken, would you like me to re-build this patch on top of current CVS, >> or >> would you like to do it yourself? My patch has the replication bugfixes >> which >> are still worth doing, but Simon's logic is actually correct for the test >> while mine isn't (though I renamed the function he's using...) > > If you have the time. I'm off banging on other things at the moment. Attached are tidied up versions of both my earlier patches on top of what you've already got in CVS. They apply fine on top of current CVS trunk: root@test1:/work/cvs/cyrus-imapd# patch -p1 < /work/cyrus-imapd-2.3.10/patches/cyrus-skiplist-newfixes-2.3.10.diff patching file lib/cyrusdb_skiplist.c Hunk #1 succeeded at 2113 (offset -1 lines). Hunk #2 succeeded at 2140 (offset -1 lines). Hunk #3 succeeded at 2166 (offset -1 lines). Hunk #4 succeeded at 2206 (offset -1 lines). root@test1:/work/cvs/cyrus-imapd# patch -p1 < /work/cyrus-imapd-2.3.10/patches/cyrus-deletemode-userfix-2.3.10.diff patching file imap/mboxname.c patching file imap/mboxlist.c patching file imap/mboxlist.h patching file imap/mboxname.h patching file imap/imapd.c Hunk #1 succeeded at 5006 (offset 2 lines). Hunk #2 succeeded at 5098 (offset 2 lines). Bron. ---- Cyrus Home Page: http://cyrusimap.web.cmu.edu/ Cyrus Wiki/FAQ: http://cyrusimap.web.cmu.edu/twiki List Archives/Info: http://asg.web.cmu.edu/cyrus/mailing-list.html
