From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from qmta10.westchester.pa.mail.comcast.net (qmta10.westchester.pa.mail.comcast.net [IPv6:2001:558:fe14:43:76:96:62:17]) by hurricane.the-brannons.com (Postfix) with ESMTP id 15E4F77AD6 for ; Tue, 24 Dec 2013 08:53:03 -0800 (PST) Received: from omta06.westchester.pa.mail.comcast.net ([76.96.62.51]) by qmta10.westchester.pa.mail.comcast.net with comcast id 5Sy81n00216LCl05AUszUz; Tue, 24 Dec 2013 16:52:59 +0000 Received: from eklhad ([107.5.36.150]) by omta06.westchester.pa.mail.comcast.net with comcast id 5Usy1n00u3EMmQj3SUszUP; Tue, 24 Dec 2013 16:52:59 +0000 To: Edbrowse-dev@lists.the-brannons.com From: Karl Dahlke User-Agent: edbrowse/3.4.10 Date: Tue, 24 Dec 2013 11:52:57 -0500 Message-ID: <20131124115257.eklhad@comcast.net> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1387903979; bh=R5yuGXxoHCpClImhItPVCdSJLB+bL6x221Pc1t/l8Jw=; h=Received:Received:To:From:Reply-to:Subject:Date:Message-ID: Mime-Version:Content-Type; b=gmT6vg3utkfyHpj/92MQBV1pS2HZ7k9UK5S1hO24tzOze0TjlrZoxMK3S7tINHhv4 jXJ/EsLgC1/9RmA0mDqjTzIitl9FKKxauRn+DvoPODVO0o2qJ1DmJAqaQQfGawIhfx fn6srLRC8JQgnW334vXbQkF3yVZxkhZqnf0e4lbmCIBxQVAppnSrfLoje8KQqAuho4 g53JznWpnofQiMNG1r/1P7+8fqoIe64c84hRqdqzzpbf8MKN4fHDj0ZfghM5F9tPdU RYBjdC14s34AjSy8imzo6n0PRbsiC/HXDGfwVHRXkQyQz0oQR1Jt00woU2PimXRzCP DeJu4Dm7Enjag== Subject: [Edbrowse-dev] status and suggest X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Karl Dahlke List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 16:53:04 -0000 Ok I seem to have permanently broken git am. I tried the --abort and got weird errors, tried to do git am and again got weird errors, but different from before, so finally I just put in Adam's two patches by hand. Sometimes you just put the car in manula mode and drive. So Adam please pull, from the master branch, and see if that looks like what you want. I totally don't want to miss out on Adam's time, while he has it to spend, because I think he knows more c++ than the rest of us, he certainly knows more than me, so I would suggest... We let Adam move forward, and post patches, as he has been doing, chris and I review, and I push the patches with any possible changes. I'm not trying to be arrogant here, but I did write the damn thing, and I am familiar with all the code and the unexpected side effects, so I should probably be the last checkpoint. Well it's just a suggestion; what do you think? I'm open to other pathways. Karl Dahlke