From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernt Hansen <bernt@norang.ca>
Subject: Re: Testing --- again...
Date: Tue, 05 Oct 2010 20:48:34 -0400
Message-ID: <87iq1gjgd9.fsf@gollum.intra.norang.ca>
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; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=57794 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P3IBy-0005r3-4V
	for emacs-orgmode@gnu.org; Tue, 05 Oct 2010 20:49:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernt@norang.ca>) id 1P3IBg-0000LE-AT
	for emacs-orgmode@gnu.org; Tue, 05 Oct 2010 20:48:54 -0400
Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:65232)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernt@norang.ca>) id 1P3IBg-0000KF-8d
	for emacs-orgmode@gnu.org; Tue, 05 Oct 2010 20:48:52 -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." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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 <schulte.eric@gmail.com>
Cc: Emacs-orgmode mailing list <emacs-orgmode@gnu.org>, Carsten Dominik <carsten.dominik@gmail.com>

"Eric Schulte" <schulte.eric@gmail.com> writes:

> 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.
>
> Thoughts?

Hi Eric and Sebastian,

There's no technical reason that you need to rebase the combined-testing
branch -- there is nothing wrong with making small commits and merging
master into it to fix any conflicts -- eventually when it gets merged
back to master the history will stay intact.

I personally only rebase local work that hasn't been published.  As soon
as the combined-testing branch is useful and public I think it should no
longer be rebased.

I'm really looking forward to getting my hands dirty in this testing
stuff for the clocking functions (since I seem to break those a lot :-P)

Thanks for all of your efforts so far and please keep up the great work!

Regards,
Bernt