From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eric Schulte" Subject: Re: Testing --- again... Date: Tue, 05 Oct 2010 20:57:20 -0600 Message-ID: <877hhw9eyx.fsf@gmail.com> 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> <87iq1gjgd9.fsf@gollum.intra.norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from [140.186.70.92] (port=50021 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P3Kgh-0001Ns-GZ for emacs-orgmode@gnu.org; Tue, 05 Oct 2010 23:29:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P3Kgg-0006xV-3p for emacs-orgmode@gnu.org; Tue, 05 Oct 2010 23:29:03 -0400 Received: from mail-yx0-f169.google.com ([209.85.213.169]:51596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P3Kgg-0006xQ-0G for emacs-orgmode@gnu.org; Tue, 05 Oct 2010 23:29:02 -0400 Received: by yxk8 with SMTP id 8so3416889yxk.0 for ; Tue, 05 Oct 2010 20:29:01 -0700 (PDT) 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: Bernt Hansen Cc: Emacs-orgmode mailing list , Carsten Dominik Bernt Hansen writes: > "Eric Schulte" 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. > Noted, I was just shying away from including too many commits in the revision history. > > 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. > Ah, that's a good point. Although this is all moot now as the testing branch has now been merged into the master branch. > > 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) > Great, I'm really looking forward to seeing how the test framework develops as it gets more users. Best -- Eric > > Thanks for all of your efforts so far and please keep up the great > work! > > Regards, > Bernt