[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: New test files in emacs-25 branch

From: Phillip Lord
Subject: Re: New test files in emacs-25 branch
Date: Thu, 03 Dec 2015 17:52:22 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Eli Zaretskii <address@hidden> 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

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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]