From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Fri, 20 Aug 2010 14:56:25 +0200 Message-ID: <874oep8mti.fsf@telefonica.net> References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <83vd75prjf.fsf@gnu.org> <83sk29pj4a.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282309223 12601 80.91.229.12 (20 Aug 2010 13:00:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 20 Aug 2010 13:00:23 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 20 15:00:22 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.69) (envelope-from ) id 1OmRCk-000394-B9 for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2010 15:00:18 +0200 Original-Received: from localhost ([127.0.0.1]:43551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmRCj-0002BW-JS for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2010 09:00:17 -0400 Original-Received: from [140.186.70.92] (port=38842 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmRCZ-00029g-5g for emacs-devel@gnu.org; Fri, 20 Aug 2010 09:00:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmRCX-0005RH-Rv for emacs-devel@gnu.org; Fri, 20 Aug 2010 09:00:06 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:39391) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmRCX-0005Qx-LR for emacs-devel@gnu.org; Fri, 20 Aug 2010 09:00:05 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OmRCV-00031h-CA for emacs-devel@gnu.org; Fri, 20 Aug 2010 15:00:03 +0200 Original-Received: from 83.42.13.171 ([83.42.13.171]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Aug 2010 15:00:03 +0200 Original-Received: from ofv by 83.42.13.171 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Aug 2010 15:00:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 9 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.171 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:Jx+RtVXPckGSU2sqvIliRV6K88E= X-detected-operating-system: by eggs.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:128919 Archived-At: Eli Zaretskii writes: > IIUC, if you resync with the master repo with "bzr merge", your local > commits will appear on a branch when you push. No, your local commits will appear on the leftmost side of the DAG. But some commits (precisely those you merged on your local branch) that previously were on the leftmost side of the DAG are displaced to the right, which is very bad. See my other post.