From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Bzr document unclear. There is no "conflict markers". Date: Mon, 04 Jan 2010 11:23:34 -0500 Message-ID: References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <87aawvi540.fsf@bnikolic.co.uk> <871vi6izni.fsf@bnikolic.co.uk> Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: ger.gmane.org 1262622384 23547 80.91.229.12 (4 Jan 2010 16:26:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Jan 2010 16:26:24 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bojan Nikolic Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 04 17:26:17 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 1NRpl2-0004oa-0g for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 17:26:16 +0100 Original-Received: from localhost ([127.0.0.1]:42839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRpl2-0005cx-Dg for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 11:26:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRpj9-0002fC-Bp for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRpj1-0002TL-BE for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:15 -0500 Original-Received: from [199.232.76.173] (port=58981 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRpj0-0002T2-U7 for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:10 -0500 Original-Received: from [140.186.70.10] (port=56195 helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRpj0-00012C-3Q for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:10 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NRpiQ-0004n8-6m; Mon, 04 Jan 2010 11:23:34 -0500 In-reply-to: <871vi6izni.fsf@bnikolic.co.uk> (message from Bojan Nikolic on Sun, 03 Jan 2010 22:36:49 +0000) 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." 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:119373 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?