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: Bzr document unclear. There is no "conflict markers". Date: Mon, 04 Jan 2010 06:08:59 +0200 Message-ID: <83y6kecy04.fsf@gnu.org> References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <87aawvi540.fsf@bnikolic.co.uk> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1262578281 30481 80.91.229.12 (4 Jan 2010 04:11:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Jan 2010 04:11:21 +0000 (UTC) Cc: bojan@bnikolic.co.uk, 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 05:11:14 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 1NReHh-0004U0-9Q for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 05:11:13 +0100 Original-Received: from localhost ([127.0.0.1]:56529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NReHh-00025h-Mu for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 23:11:13 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NReHc-000253-IE for emacs-devel@gnu.org; Sun, 03 Jan 2010 23:11:08 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NReHY-00020b-19 for emacs-devel@gnu.org; Sun, 03 Jan 2010 23:11:08 -0500 Original-Received: from [199.232.76.173] (port=46070 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NReHX-00020U-Vi for emacs-devel@gnu.org; Sun, 03 Jan 2010 23:11:03 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:42102) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NReHV-0005G6-SB; Sun, 03 Jan 2010 23:11:02 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVP00K00F52T100@a-mtaout20.012.net.il>; Mon, 04 Jan 2010 06:11:00 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVP00KKZFMBZ330@a-mtaout20.012.net.il>; Mon, 04 Jan 2010 06:11:00 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:119340 Archived-At: > From: Richard Stallman > Date: Sun, 03 Jan 2010 16:59:59 -0500 > Cc: emacs-devel@gnu.org > > I think it is usually better do the merge first (and resolve any > possible conflicts) before making the edits that make up your fix. > > I find that hard to understand. If you have not yet edited the file, > what is there to merge? 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. Note that "merge" in Bazaar is not just the merge of the files' contents, it is (AFAIU) also the merge of histories of the branch and trunk, i.e. the DAG that represents the history of each of the two trees is merged to include both.