From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 19:05:01 -0500
Message-ID: <E1NZYvV-00044y-De@fencepost.gnu.org>
References: <E1NZJ1t-00089o-ST@monty-python.gnu.org> <83vdeq634g.fsf@gnu.org>
	<m2k4v6bkn3.fsf@igel.home> <83sk9u5wes.fsf@gnu.org>
	<m2fx5ubi7c.fsf@igel.home> <87ljfm329g.fsf@telefonica.net>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1264464383 13916 80.91.229.12 (26 Jan 2010 00:06:23 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 26 Jan 2010 00:06:23 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: =?utf-8?Q?=C3=93scar_Fuentes?= <ofv@wanadoo.es>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 01:06:15 2010
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 ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1NZYwg-00046q-43
	for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 01:06:14 +0100
Original-Received: from localhost ([127.0.0.1]:58996 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NZYwh-0007d2-Bm
	for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 19:06:15 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NZYvb-00078z-Ng
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:07 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NZYvW-00074u-UL
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:07 -0500
Original-Received: from [199.232.76.173] (port=57476 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NZYvW-00074p-NK
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:02 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:50962)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1NZYvW-0008HM-A8
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:02 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <rms@gnu.org>)
	id 1NZYvV-00044y-De; Mon, 25 Jan 2010 19:05:01 -0500
In-reply-to: <87ljfm329g.fsf@telefonica.net> (message from
	=?utf-8?Q?=C3=93scar_Fuentes?= on Mon, 25 Jan 2010 11:30:35 +0100)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:120406
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/120406>

    If my guess is right, Mark merged trunk into his private branch, and
    then pushed to upstream, which is very wrong.

If we think this is wrong practice, can we customize something so that
it isn't allowed?