From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 20:18:33 -0500 Message-ID: References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> <83d40w69hv.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264556055 30943 80.91.229.12 (27 Jan 2010 01:34:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Jan 2010 01:34:15 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 27 02:34:07 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 1NZwn6-0007Nc-4G for ged-emacs-devel@m.gmane.org; Wed, 27 Jan 2010 02:34:03 +0100 Original-Received: from localhost ([127.0.0.1]:36110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZwmq-0005cl-Je for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 20:33:40 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZwmm-0005bc-Cu for emacs-devel@gnu.org; Tue, 26 Jan 2010 20:33:36 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZwmi-0005Ym-QV for emacs-devel@gnu.org; Tue, 26 Jan 2010 20:33:36 -0500 Original-Received: from [199.232.76.173] (port=50560 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZwmi-0005Yj-N7 for emacs-devel@gnu.org; Tue, 26 Jan 2010 20:33:32 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:21524) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZwbL-0003B3-KG; Tue, 26 Jan 2010 20:21:57 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181] helo=ironport2-out.pppoe.ca) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZwYY-0006ak-IU; Tue, 26 Jan 2010 20:18:54 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AsoEAG8jX0tFpaAe/2dsb2JhbACBO9hvhDcEiks X-IronPort-AV: E=Sophos;i="4.49,349,1262581200"; d="scan'208";a="54631911" Original-Received: from 69-165-160-30.dsl.teksavvy.com (HELO ceviche.home) ([69.165.160.30]) by ironport2-out.pppoe.ca with ESMTP; 26 Jan 2010 20:18:34 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id ED7A27001F; Tue, 26 Jan 2010 20:18:33 -0500 (EST) In-Reply-To: (Richard Stallman's message of "Tue, 26 Jan 2010 17:43:48 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120474 Archived-At: >> 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. > Sorry, it is the push from a branch that caused the confusion. Yes. > Should only the maintainers, Stefan and Yidong, be able to do that? I'd say "not even". Basically, instead of "push" to the trunk, the right way is to "merge" from some other branch onto the trunk. In any case, the .bzr/branch/branch.conf modification should ensure that such errors don't happen any more. Stefan