From: phillip.lord@russet.org.uk (Phillip Lord)
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: New test files in emacs-25 branch
Date: Thu, 03 Dec 2015 17:52:22 +0000 [thread overview]
Message-ID: <87lh9bo1wp.fsf@russet.org.uk> (raw)
In-Reply-To: <83k2ovix06.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 3 Dec 2015 13:37:13 +0200")
Eli Zaretskii <eliz@gnu.org> writes:
> I guess new test files introduced on the emacs-25 branch will have to
> be manually added to the corresponding directory on master, since
> gitmerge.el won't be able to pull such trickery, right?
I guess this crossed my mind sometime after I offered to move all the
file locations. Probably it would have made sense to leave things till
after the emacs-25.
If this is going to be a major PITA (and it probably is), one solution
would be to create a "test/automated" directory on master. The make
files will already pick this up correctly and run any tests in it (on
master). These files can then be moved enmass after the emacs-25
release.
Is git is intelligent enough to work through a file move? Will new tests
added to existing test files in the automated directory of emacs-25
merge into the moved files on master? If not, I fear, new tests in
existing files is likely to be more of an issue. If so, then new files
in emacs-25 test/automated can be merged to master, and then moved to
the new directory structure any time on master, and new tests or changes
should follow.
Phil
next prev parent reply other threads:[~2015-12-03 17:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 11:37 New test files in emacs-25 branch Eli Zaretskii
2015-12-03 12:53 ` Artur Malabarba
2015-12-03 13:20 ` Eli Zaretskii
2015-12-03 17:52 ` Phillip Lord [this message]
2015-12-03 20:13 ` Eli Zaretskii
2015-12-03 22:41 ` Phillip Lord
2015-12-04 8:32 ` Eli Zaretskii
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.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lh9bo1wp.fsf@russet.org.uk \
--to=phillip.lord@russet.org.uk \
--cc=eliz@gnu.org \
--cc=emacs-devel@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.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).