From: Paul Eggert <eggert@cs.ucla.edu>
To: Eli Zaretskii <eliz@gnu.org>, rudalics@gmx.at, emacs-devel@gnu.org
Cc: Phillip Lord <phillip.lord@russet.org.uk>
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Mon, 21 Mar 2016 17:17:04 -0700 [thread overview]
Message-ID: <56F08F00.1070807@cs.ucla.edu> (raw)
In-Reply-To: <m2wpovr06k.fsf@newartisans.com>
[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]
On 03/21/2016 02:27 PM, John Wiegley wrote:
> I think there are two possible answers:
>
> 1. gitmerge.el auto-marked it to be skipped, and despite my examination of
> each such mark, I failed to see that should not be skipped.
>
> 2. I incorrectly resolved a merge conflict that seemed simple enough to me
> that I didn't e-mail the author of the commit about it.
>
> So, in both case, human error pointed at me.
I think you're right it wasn't a tool error per se (though the tools are
error-prone).
Human error also points at me, since I merged the resulting bad branch
against a good branch and didn't notice the issue. In an attempt to fix
the problem I looked for the clump of commits near the lost one, and
reinstalled them into master by applying the attached patches. (I did
not look for similar clumps yet.)
There is one patch near this clump, where I wasn't sure whether it was
superseded by existing patches on 'master', so I left it alone. Phillip,
can you please look into this? Thanks. The patch in question is this
one, and the question is whether it needs to be modified and reapplied
to the master branch:
commit 549a765efeca2748e68a5c6ce6c9238784e82535
Author: Phillip Lord <phillip.lord@russet.org.uk>
Date: Fri Jan 15 22:11:39 2016 +0000
Enable test selector from command line
* test/automated/Makefile.in: Change variable manipulation to avoid
over-writing selector.
http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=549a765efeca2748e68a5c6ce6c9238784e82535
[-- Attachment #2: 0001-etc-NEWS-Remove-unneeded-text.patch --]
[-- Type: application/x-patch, Size: 731 bytes --]
[-- Attachment #3: 0002-Fix-picture-mode-wrt-double-width-characters.patch --]
[-- Type: application/x-patch, Size: 1219 bytes --]
[-- Attachment #4: 0003-Unhide-the-no-line-directive-option-to-etags.patch --]
[-- Type: application/x-patch, Size: 3023 bytes --]
[-- Attachment #5: 0004-Merge-doc-fixes-for-random-lost-in-previous-merge.patch --]
[-- Type: application/x-patch, Size: 1807 bytes --]
[-- Attachment #6: 0005-In-comment-dwim-with-style-extra-line-respect-indent.patch --]
[-- Type: application/x-patch, Size: 1950 bytes --]
[-- Attachment #7: 0006-Ensure-positive-number-of-glyphs-for-margins-of-posi.patch --]
[-- Type: application/x-patch, Size: 1185 bytes --]
[-- Attachment #8: 0007-Don-t-confuse-with-when-trying-to-parse-member-initi.patch --]
[-- Type: application/x-patch, Size: 2421 bytes --]
next prev parent reply other threads:[~2016-03-22 0:17 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-20 11:36 Missing changes in merges from emacs-25 to master martin rudalics
2016-03-20 17:32 ` Eli Zaretskii
2016-03-20 18:38 ` martin rudalics
2016-03-20 18:50 ` Eli Zaretskii
2016-03-20 19:15 ` martin rudalics
2016-03-21 7:36 ` Paul Eggert
2016-03-21 9:22 ` martin rudalics
2016-03-21 17:55 ` Paul Eggert
2016-03-22 10:22 ` martin rudalics
2016-03-22 10:36 ` Andreas Schwab
2016-03-22 10:58 ` martin rudalics
2016-03-22 11:32 ` Andreas Schwab
2016-03-22 11:47 ` martin rudalics
2016-03-22 15:20 ` Óscar Fuentes
2016-03-22 17:08 ` martin rudalics
2016-03-22 15:24 ` Noam Postavsky
2016-03-22 17:08 ` martin rudalics
2016-03-21 16:06 ` Eli Zaretskii
2016-03-21 17:55 ` John Wiegley
2016-03-21 17:57 ` Paul Eggert
2016-03-21 18:16 ` Eli Zaretskii
2016-03-21 21:27 ` John Wiegley
2016-03-22 0:17 ` Paul Eggert [this message]
2016-03-22 0:52 ` Paul Eggert
2016-03-22 3:35 ` Eli Zaretskii
2016-03-22 16:18 ` Eli Zaretskii
2016-03-22 16:30 ` Stefan Monnier
2016-03-22 16:45 ` Eli Zaretskii
2016-03-22 16:52 ` Stefan Monnier
2016-03-22 17:03 ` Eli Zaretskii
2016-03-22 18:21 ` Paul Eggert
2016-03-22 18:33 ` Eli Zaretskii
2016-03-23 13:10 ` Stefan Monnier
2016-03-22 18:41 ` Stefan Monnier
2016-03-22 18:58 ` Eli Zaretskii
2016-03-23 2:08 ` Stefan Monnier
2016-03-23 8:07 ` Andreas Schwab
2016-03-22 19:34 ` Lars Magne Ingebrigtsen
2016-03-22 19:49 ` Eli Zaretskii
2016-03-24 7:18 ` Phillip Lord
2016-03-22 18:32 ` Paul Eggert
2016-03-22 18:37 ` Eli Zaretskii
2016-03-22 19:15 ` Paul Eggert
2016-03-22 19:42 ` Eli Zaretskii
2016-03-22 20:26 ` Paul Eggert
2016-03-22 22:57 ` David Engster
2016-03-22 23:45 ` Paul Eggert
2016-03-25 8:52 ` Eli Zaretskii
2016-03-25 9:14 ` Andreas Schwab
2016-03-25 10:48 ` Eli Zaretskii
2016-03-25 11:50 ` Andreas Schwab
2016-03-25 13:55 ` Eli Zaretskii
2016-03-25 9:15 ` David Engster
2016-03-25 10:50 ` Eli Zaretskii
2016-03-25 11:38 ` David Engster
2016-03-25 14:15 ` Eli Zaretskii
2016-03-25 16:00 ` David Engster
2016-03-25 16:27 ` David Engster
2016-03-25 17:33 ` Eli Zaretskii
2016-03-25 17:52 ` David Engster
2016-03-25 18:43 ` Eli Zaretskii
2016-03-25 19:29 ` Óscar Fuentes
2016-03-25 19:42 ` Paul Eggert
2016-03-26 21:34 ` Stefan Monnier
2016-03-22 17:00 ` Phillip Lord
2016-03-22 18:24 ` Eli Zaretskii
2016-03-22 19:21 ` John Wiegley
2016-03-22 19:46 ` 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=56F08F00.1070807@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=phillip.lord@russet.org.uk \
--cc=rudalics@gmx.at \
/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.