From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Bzr document unclear. There is no "conflict markers".
Date: Mon, 04 Jan 2010 11:23:57 -0500
Message-ID: <E1NRpin-0004rE-8x@fencepost.gnu.org>
References: <4B40914B.4070203@swipnet.se> <E1NRQgR-0007Yu-IQ@fencepost.gnu.org>
	<4B40AACE.9020002@swipnet.se> <87aawvi540.fsf@bnikolic.co.uk>
	<E1NRYUR-0001UF-Ho@fencepost.gnu.org> <83y6kecy04.fsf@gnu.org>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1262622500 23953 80.91.229.12 (4 Jan 2010 16:28:20 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 4 Jan 2010 16:28:20 +0000 (UTC)
Cc: bojan@bnikolic.co.uk, emacs-devel@gnu.org
To: Eli Zaretskii <eliz@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 04 17:28:13 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 1NRpms-0005eh-Pq
	for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 17:28:10 +0100
Original-Received: from localhost ([127.0.0.1]:43837 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NRpmt-0007hB-3Z
	for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 11:28:11 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NRpjD-0002pR-FX
	for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:23 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NRpj9-0002e1-02
	for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:22 -0500
Original-Received: from [199.232.76.173] (port=58990 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NRpj7-0002dW-OH
	for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:17 -0500
Original-Received: from [140.186.70.10] (port=56205 helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1NRpj7-00015z-Jg
	for emacs-devel@gnu.org; Mon, 04 Jan 2010 11:24:17 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <rms@gnu.org>)
	id 1NRpin-0004rE-8x; Mon, 04 Jan 2010 11:23:57 -0500
In-reply-to: <83y6kecy04.fsf@gnu.org> (message from Eli Zaretskii on Mon, 04
	Jan 2010 06:08:59 +0200)
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." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:119375
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/119375>

    For the first edit ever in that branch, you are right.  But once you
    begin working there, the histories of the branch and the trunk
    diverge, so a merge is necessary.

But after you commit your changes from the branch to the trunk,
isn't everything in sync until you start to edit again?