From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (unknown [IPv6:2602:4b:a4e8:5700:12bf:48ff:fe7c:5584]) by hurricane.the-brannons.com (Postfix) with ESMTPSA id B30B977AAF for ; Tue, 24 Dec 2013 08:26:08 -0800 (PST) From: Chris Brannon To: edbrowse-dev@lists.the-brannons.com References: <20131124111303.eklhad@comcast.net> Date: Tue, 24 Dec 2013 08:26:03 -0800 In-Reply-To: <20131124111303.eklhad@comcast.net> (Karl Dahlke's message of "Tue, 24 Dec 2013 11:13:03 -0500") Message-ID: <874n5yb4h0.fsf@mushroom.PK5001Z> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Edbrowse-dev] even more confused X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.17 Precedence: list List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2013 16:26:09 -0000 Karl Dahlke writes: > and Chris did the same thingtoo, in another branch. I discarded my changes after I saw that yours were pushed. Sorry for all the confusion. I had some spare cycles this morning, and I wanted to start moving forward. > previous rebase directory /home/eklhad/progs/edbrowse/.git/rebase-apply still exists but mbox given. > You should run git am --abort to clear this up. My guess is that you ran git am at some point in the distant past and it failed, leaving that rebase-apply directory. So after --abort, you should be able to apply both of these. I've done it over here, so I can push them if need be. As an aside, in patch 4/4, we should probably use JS_H, rather than _JS_H. > if both those branches have zillions of changes to essentially the same lines of code, > which is already the case for us, No, see above. My branch incorporates your eb_bool change, rather than my aborted one. -- Chris