emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Eric Schulte" <schulte.eric@gmail.com>
To: Sebastian Rose <sebastian_rose@gmx.de>
Cc: Emacs-orgmode mailing list <emacs-orgmode@gnu.org>,
	Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: Re: Testing --- again...
Date: Tue, 05 Oct 2010 12:57:53 -0600	[thread overview]
Message-ID: <87hbh0bh72.fsf@gmail.com> (raw)
In-Reply-To: <87d3rpmqus.fsf@gmx.de> (Sebastian Rose's message of "Tue, 05 Oct 2010 02:21:31 +0200")

Sebastian Rose <sebastian_rose@gmx.de> writes:

> "Eric Schulte" <schulte.eric@gmail.com> 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.
>
>

Great, I've just merged this into the master branch.

>
>
>
> Eric, can we keep track with the ERT development for a little while?
> That will not be done automatically, right? 

Right, but at our leasure we can
1) cd into the testing/ert directory
2) git pull the latest version of ert into that directory
3) and on our next git commit the update will be committed to the git
   submodules

> 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 submodule update
>
> Should that be called once to avoid conflicts?
>

Most users need never run

  git submodule init

or

  git subomdule update

however for those of us writing and using tests, we will want to run

  git submodule init

at least once, and run

  git submodule update

from time to time, to pull down newer versions of ert which may have
been committed to the org-mode repo by the process described at the top
of this email.

Best -- Eric

>
>
>   Sebastian

  reply	other threads:[~2010-10-05 18:58 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 [this message]
2010-10-06  0:48                   ` Bernt Hansen
2010-10-06  2:57                     ` Eric Schulte
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=87hbh0bh72.fsf@gmail.com \
    --to=schulte.eric@gmail.com \
    --cc=carsten.dominik@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=sebastian_rose@gmx.de \
    /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).