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 20:27:34 +0200 Message-ID: <83tyv1d8tl.fsf@gnu.org> References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <87aawvi540.fsf@bnikolic.co.uk> <83y6kecy04.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1262629870 17735 80.91.229.12 (4 Jan 2010 18:31:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 Jan 2010 18:31:10 +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 19:31:02 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 1NRrhl-0003MR-W1 for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 19:31:02 +0100 Original-Received: from localhost ([127.0.0.1]:42964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRrhm-0007PT-Gf for ged-emacs-devel@m.gmane.org; Mon, 04 Jan 2010 13:31:02 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRrgf-0005lP-Cl for emacs-devel@gnu.org; Mon, 04 Jan 2010 13:29:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRrga-0005dS-GE for emacs-devel@gnu.org; Mon, 04 Jan 2010 13:29:52 -0500 Original-Received: from [199.232.76.173] (port=58798 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRrga-0005dE-7D for emacs-devel@gnu.org; Mon, 04 Jan 2010 13:29:48 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:60987) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRrgX-0004j0-Rc; Mon, 04 Jan 2010 13:29:46 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVQ00700JCNKG00@a-mtaout20.012.net.il>; Mon, 04 Jan 2010 20:29:35 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVQ003L0JD9PHK0@a-mtaout20.012.net.il>; Mon, 04 Jan 2010 20:29:34 +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:119386 Archived-At: > From: Richard Stallman > CC: bojan@bnikolic.co.uk, emacs-devel@gnu.org > Date: Mon, 04 Jan 2010 11:23:57 -0500 > > 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? Maybe in theory. Do you always commit _all_ your changes? don't you sometimes leave some of them out because you are still working on them or testing them? And what about all those ChangeLog entries you made while working in the branch -- won't you rewrite them at least to some extent for committing to the trunk? Besides, personally I'm not even sure ``everything is in sync'' even if you commit everything. I think that the DAG representing the branch will still be different from the one representing the trunk, due to local commits. Somebody who knows more about bzr internals, please confirm or refute this.