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: Wed, 27 Jan 2010 06:08:48 +0200 Message-ID: <83ockg42b3.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> <83d40w69hv.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264565348 18164 80.91.229.12 (27 Jan 2010 04:09:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Jan 2010 04:09:08 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 27 05:09:00 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 1NZzD7-0000lC-BO for ged-emacs-devel@m.gmane.org; Wed, 27 Jan 2010 05:08:57 +0100 Original-Received: from localhost ([127.0.0.1]:58743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZzD8-0003WP-9g for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 23:08:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZzD3-0003WJ-LH for emacs-devel@gnu.org; Tue, 26 Jan 2010 23:08:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZzCy-0003VR-US for emacs-devel@gnu.org; Tue, 26 Jan 2010 23:08:53 -0500 Original-Received: from [199.232.76.173] (port=59497 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZzCy-0003VG-Qf for emacs-devel@gnu.org; Tue, 26 Jan 2010 23:08:48 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:35141) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZzCx-0000VA-2l; Tue, 26 Jan 2010 23:08:47 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZzCw-0003vf-C3; Tue, 26 Jan 2010 23:08:46 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KWW00J000RITG00@a-mtaout20.012.net.il>; Wed, 27 Jan 2010 06:08:45 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWW00HKB0UKZV80@a-mtaout20.012.net.il>; Wed, 27 Jan 2010 06:08:44 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by mx20.gnu.org: Solaris 10 (beta) 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:120476 Archived-At: > From: Stefan Monnier > Date: Tue, 26 Jan 2010 20:18:33 -0500 > Cc: Eli Zaretskii , emacs-devel@gnu.org > > >> 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. Actually, not every "push" is harmful, and the option you set will not prevent those that are not. (If we want to develop a useful common understanding of the issues related to Bazaar and the right workflow with it, I think we should try to be as accurate as possible about the semantics and the effects of the operations we discuss.)