From: Eli Zaretskii <eliz@gnu.org>
To: phillip.lord@russet.org.uk (Phillip Lord)
Cc: emacs-devel@gnu.org
Subject: Re: New test files in emacs-25 branch
Date: Thu, 03 Dec 2015 22:13:24 +0200 [thread overview]
Message-ID: <83fuzji93v.fsf@gnu.org> (raw)
In-Reply-To: <87lh9bo1wp.fsf@russet.org.uk>
> From: phillip.lord@russet.org.uk (Phillip Lord)
> Cc: <emacs-devel@gnu.org>
> Date: Thu, 03 Dec 2015 17:52:22 +0000
>
> 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.
It wouldn't have mattered. Emacs 25.1 is not going to be the only
version delivered from the emacs-25 branch.
> 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.
It's not a PITA. For a rare event such as this one, committing twice
is not a catastrophe. I just wanted to be sure there are no better
ideas.
> 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?
That should work, but I wasn't talking about this. I was talking
about adding new files to emacs-25.
> 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.
That's error prone, so I'd rather we avoided it.
next prev parent reply other threads:[~2015-12-03 20:13 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
2015-12-03 20:13 ` Eli Zaretskii [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83fuzji93v.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=phillip.lord@russet.org.uk \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.