From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Rose Subject: Re: Re: Testing --- again... Date: Tue, 05 Oct 2010 02:21:31 +0200 Message-ID: <87d3rpmqus.fsf@gmx.de> References: <87vd5li75s.fsf@gmx.de> <0CDCC1C3-3D93-465E-827C-A722978F4D13@gmail.com> <87fwwoihuy.fsf@gmail.com> <87fwwobd9k.fsf@gmx.de> <871v88ibhh.fsf@gmail.com> <87sk0ofef3.fsf@gmail.com> <87ocbbvuig.fsf@gmx.de> <87vd5ibve8.fsf@gmail.com> <87tyl2vc9t.fsf@gmx.de> <8739sm6ksk.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from [140.186.70.92] (port=54564 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2vHm-0000vy-24 for emacs-orgmode@gnu.org; Mon, 04 Oct 2010 20:21:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P2vHk-00047n-M2 for emacs-orgmode@gnu.org; Mon, 04 Oct 2010 20:21:38 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:52291 helo=mail.gmx.net) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1P2vHk-00047e-96 for emacs-orgmode@gnu.org; Mon, 04 Oct 2010 20:21:36 -0400 In-Reply-To: <8739sm6ksk.fsf@gmail.com> (Eric Schulte's message of "Mon, 04 Oct 2010 09:26:51 -0600") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Eric Schulte Cc: Emacs-orgmode mailing list , Carsten Dominik "Eric Schulte" writes: > Hi, > > So, I've been using the framework in the combined-testing branch this > morning writing tests to strap down my daily Babel bug fixes, and I'm > really liking ERT. > > I wonder, can we commit to the combined-testing branch, and if so could > we fold it into the master branch? It would make my test driven bug > fixing a much smoother process, and would remove the need to rebase the > combined-testing branch against master and "git push -f" the changes up > to repo.or.cz which just feels wrong. Yes, commit to that branch. And yes, fold it into master, if there are no objections. In the worst case there will be more contributions. Eric, can we keep track with the ERT development for a little while? That will not be done automatically, right? But, as you know, Christian is working on it to get it into Emacs, and we should use the version that finally will make it there. git submodul update Should that be called once to avoid conflicts? Sebastian