emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Eric Schulte" <schulte.eric@gmail.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: Emacs-orgmode mailing list <emacs-orgmode@gnu.org>,
	Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: Testing --- again...
Date: Tue, 05 Oct 2010 20:57:20 -0600	[thread overview]
Message-ID: <877hhw9eyx.fsf@gmail.com> (raw)
In-Reply-To: 87iq1gjgd9.fsf@gollum.intra.norang.ca

Bernt Hansen <bernt@norang.ca> writes:

> "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.
>

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

  reply	other threads:[~2010-10-06  3:29 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-02  3:51 Testing --- again Sebastian Rose
2010-10-02  8:09 ` Carsten Dominik
2010-10-02 14:53   ` Sebastian Rose
2010-10-02 15:01   ` Sebastian Rose
2010-10-02 17:05     ` Carsten Dominik
2010-10-02 18:12   ` Eric Schulte
2010-10-02 19:33     ` Sebastian Rose
2010-10-02 20:30       ` Eric Schulte
2010-10-02 21:55         ` Eric Schulte
2010-10-03  0:46           ` Sebastian Rose
2010-10-04  1:26             ` Eric Schulte
2010-10-04  3:59               ` Sebastian Rose
2010-10-04 15:26                 ` Eric Schulte
2010-10-05  0:21                   ` Sebastian Rose
2010-10-05 18:57                     ` Eric Schulte
2010-10-06  0:48                   ` Bernt Hansen
2010-10-06  2:57                     ` Eric Schulte [this message]
2010-10-02 22:14         ` Sebastian Rose

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877hhw9eyx.fsf@gmail.com \
    --to=schulte.eric@gmail.com \
    --cc=bernt@norang.ca \
    --cc=carsten.dominik@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).