From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: MH-E patch to support nmh 1.5
Date: Tue, 30 Sep 2014 11:31:25 -0400
Message-ID: <gsa95hdt0y.fsf@fencepost.gnu.org>
References: <21240.1411964502@allegro.localdomain>
	<87r3ytu18s.fsf@olgas.newt.com>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: ger.gmane.org 1412091120 11509 80.91.229.3 (30 Sep 2014 15:32:00 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 30 Sep 2014 15:32:00 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Bill Wohler <wohler@newt.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Sep 30 17:31:52 2014
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XYzP4-0002oy-UN
	for ged-emacs-devel@m.gmane.org; Tue, 30 Sep 2014 17:31:51 +0200
Original-Received: from localhost ([::1]:43990 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XYzP4-0005NE-Ha
	for ged-emacs-devel@m.gmane.org; Tue, 30 Sep 2014 11:31:50 -0400
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52827)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1XYzOm-0005Ka-0b
	for emacs-devel@gnu.org; Tue, 30 Sep 2014 11:31:32 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1XYzOh-0004HS-4I
	for emacs-devel@gnu.org; Tue, 30 Sep 2014 11:31:31 -0400
Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59232)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1XYzOh-0004HO-1t
	for emacs-devel@gnu.org; Tue, 30 Sep 2014 11:31:27 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71)
	(envelope-from <rgm@gnu.org>)
	id 1XYzOf-0006ed-Sc; Tue, 30 Sep 2014 11:31:25 -0400
X-Spook: Manfurov tempest crypto anarchy Fedayeen doctrine SRI
X-Ran: Gm|k^>S87wES}>$Z=%Upv<etEGw!f$45'j*pkMaN0po~1A`toD=zB[k+~$mG%C?Mx*'@NM
X-Hue: blue
X-Attribution: GM
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
	(bad octet value).
X-Received-From: 2001:4830:134:3::e
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:174857
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/174857>

Bill Wohler wrote:

> I merged the changes back into trunk.

I don't know what you did, but it was not a merge commit, and it did not
merge non mh-e changes that are in emacs-24 but not yet in trunk, even
though your commit message implied it did.
(I guess you just applied the same mh-e changes by hand to both branches.)
Probably best to leave merging 24->trunk alone if you're not sure how to
do it (the answer is to use bzrmerge.el).