From: Andreas Tobler <andreast-list@fgznet.ch>
To: Miles Bader <miles@gnu.org>
Cc: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>, emacs-devel@gnu.org
Subject: Re: Possible merge conflict in src/macterm.[ch]
Date: Sun, 27 Jan 2008 23:08:06 +0100 [thread overview]
Message-ID: <479D00C6.8040905@fgznet.ch> (raw)
In-Reply-To: <61lk6hwgnc.fsf@fencepost.gnu.org>
Miles Bader wrote:
> Hi,
>
> I merged the appended changes to macterm.[ch] from the Emacs 22 release
> branch to the trunk. As there were merge conflicts, and apparently some
> trunk changes touched the same code, it seems likely that either this
> change shouldn't have been merged, or that I incorrectly resolved the
> conflict.
>
> Please check the state of macterm.[ch] in the trunk and make sure it is
> correct.
>
> [The appended ChangeLog entry is the original, but the diff is the
> change I applied to the trunk, after I tried to fix the conflicts.]
It's wrong or at least incomplete. Only the .c is merged. I guess the .h
needs a merge as well.
I try to figure out what's missing.
Andreas
next prev parent reply other threads:[~2008-01-27 22:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-23 0:05 Possible merge conflict in src/macterm.[ch] Miles Bader
2008-01-27 22:08 ` Andreas Tobler [this message]
2008-01-28 18:51 ` Andreas Tobler
2008-01-29 5:19 ` Miles Bader
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=479D00C6.8040905@fgznet.ch \
--to=andreast-list@fgznet.ch \
--cc=emacs-devel@gnu.org \
--cc=miles@gnu.org \
--cc=mituharu@math.s.chiba-u.ac.jp \
/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).