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: Tue, 26 Jan 2010 11:49:46 -0500
Message-ID: <E1NZobq-0002cM-HS@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>
	<E1NZYvV-00044y-De@fencepost.gnu.org>
	<87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1264525537 24742 80.91.229.12 (26 Jan 2010 17:05:37 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 26 Jan 2010 17:05:37 +0000 (UTC)
Cc: ofv@wanadoo.es, emacs-devel@gnu.org
To: "Stephen J. Turnbull" <stephen@xemacs.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 18:05:29 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 1NZor2-0002tp-FV
	for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 18:05:28 +0100
Original-Received: from localhost ([127.0.0.1]:32810 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NZor3-0006Si-Pg
	for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 12:05:29 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NZobw-0006xZ-Vs
	for emacs-devel@gnu.org; Tue, 26 Jan 2010 11:49:53 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NZobs-0006rU-E9
	for emacs-devel@gnu.org; Tue, 26 Jan 2010 11:49:52 -0500
Original-Received: from [199.232.76.173] (port=41947 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NZobr-0006r5-W2
	for emacs-devel@gnu.org; Tue, 26 Jan 2010 11:49:48 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:55577)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1NZobq-00046v-OK
	for emacs-devel@gnu.org; Tue, 26 Jan 2010 11:49:47 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <rms@gnu.org>)
	id 1NZobq-0002cM-HS; Tue, 26 Jan 2010 11:49:46 -0500
In-reply-to: <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> (stephen@xemacs.org)
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:120445
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/120445>

    Distinguishing between trunk->branch merges that are useful and those
    that merely create unreadable history (as displayed by bzr) requires
    fine judgment.

Should only the maintainers, Stefan and Yidong, be able to do
trunk->branch merges?