On Sun, 13 Nov 2011 13:46:30 -0400, David Bremner <david@tethera.net> wrote: > On Tue, 01 Nov 2011 20:54:49 +0100, Pieter Praet <pieter@praet.org> wrote: > > > > I'll be commenting on these modified commits where needed, and have > > re-submitted my original series (rebased to current master) in a new > > thread [1]. > > > > I'm having trouble sorting out which of these series should be > considered for notmuch master. Is there something in the rebased version > of Pieter's patches that is not present in Thomas's rebased version? > Nope, I simply rebased my original series, warts and all. Thomas' submission contains a number of fixes (missing prereqs) and improvements (test_set_bin_prereq) that should definitely be included before the series is applied, as well as some stuff that belongs in separate commits (e.g. screen prereq, which should now check for dtach instead) and a tiny mistake in the "Reply within emacs" subtest [1]. Also, both Jameson [2] and Ali [3] have brought up some valid points/concerns re the way we find and set prereqs. Thomas, could you please rebase your fixes on top of my rebased series, and submit them in the new thread [4] ? The whole deal could then be applied on a feature branch and merged into mainline integrally. > d Peace -- Pieter [1] id:"87fwi7obso.fsf@praet.org" [2] id:"87hb2n4k5c.fsf@servo.finestructure.net" [3] id:"20111101202025.GA8248@hayalet" [4] id:"1320176954-4897-1-git-send-email-pieter@praet.org"