From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 19:50:36 +0200 Message-ID: <83d40w69hv.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264528595 3778 80.91.229.12 (26 Jan 2010 17:56:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 17:56:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 18:56:27 2010 Return-path: 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 1NZpeG-0002Jd-TZ for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 18:56:21 +0100 Original-Received: from localhost ([127.0.0.1]:36349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpeI-00069Y-8W for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 12:56:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZpYn-0008Rc-0c for emacs-devel@gnu.org; Tue, 26 Jan 2010 12:50:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZpYi-0008MH-Am for emacs-devel@gnu.org; Tue, 26 Jan 2010 12:50:40 -0500 Original-Received: from [199.232.76.173] (port=49264 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpYh-0008Lr-P8 for emacs-devel@gnu.org; Tue, 26 Jan 2010 12:50:35 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:52851) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZpYg-00053C-8t; Tue, 26 Jan 2010 12:50:34 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KWV00J0083ZOP00@a-mtaout21.012.net.il>; Tue, 26 Jan 2010 19:50:33 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWV00FLQ888W6D0@a-mtaout21.012.net.il>; Tue, 26 Jan 2010 19:50:33 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:120452 Archived-At: > From: Richard Stallman > Date: Tue, 26 Jan 2010 11:49:46 -0500 > Cc: ofv@wanadoo.es, emacs-devel@gnu.org > > 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? No! Every developer who works on a feature in a separate branch needs to do that from time to time, to avoid diverging too much from mainline. The no-no (AFAIU) is to push directly from such a feature branch to the savannah repository.