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: Bzr document unclear. There is no "conflict markers". Date: Mon, 04 Jan 2010 12:08:54 -0500 Message-ID: References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <87aawvi540.fsf@bnikolic.co.uk> <871vi6izni.fsf@bnikolic.co.uk> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262625156 736 80.91.229.12 (4 Jan 2010 17:12:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Jan 2010 17:12:36 +0000 (UTC) Cc: Bojan Nikolic , emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 04 18:12:28 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 1NRqTk-00062s-2v for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 18:12:28 +0100 Original-Received: from localhost ([127.0.0.1]:42985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRqTk-0007oJ-GR for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 12:12:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRqQQ-0004YD-Ab for emacs-devel@gnu.org; Mon, 04 Jan 2010 12:09:02 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRqQL-0004Vx-Pf for emacs-devel@gnu.org; Mon, 04 Jan 2010 12:09:01 -0500 Original-Received: from [199.232.76.173] (port=45511 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRqQL-0004Vt-5j for emacs-devel@gnu.org; Mon, 04 Jan 2010 12:08:57 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:43521 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRqQJ-0007K9-FB; Mon, 04 Jan 2010 12:08:55 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArMEAAOvQUvO+KPG/2dsb2JhbACBRdMuhDAEiik X-IronPort-AV: E=Sophos;i="4.47,499,1257138000"; d="scan'208";a="52902551" Original-Received: from 206-248-163-198.dsl.teksavvy.com (HELO pastel.home) ([206.248.163.198]) by ironport2-out.pppoe.ca with ESMTP; 04 Jan 2010 12:08:55 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id C382C8FD6; Mon, 4 Jan 2010 12:08:54 -0500 (EST) In-Reply-To: (Richard Stallman's message of "Mon, 04 Jan 2010 11:23:34 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:119377 Archived-At: > The quick answer is that the "quickfixes" branch could have diverged > from the trunk, for example because some of the developers changes have > not been accepted (yet) into the trunk. > The concept of "accepted into the trunk" puzzles me. If someone has > write access, he can install his changes into the trunk, right? So if > he has committed all his past changes, there's nothing to merge -- > right? > Are you assuming the case of a person who doesn't have write access > on Savannah? I have many changes on my local branch which the maintainers haven't accepted yet. Of course, could install them anyway since I have write access, but Stefan would bite my head off if I did. Stefan