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: VC and bzr. Date: Thu, 22 Apr 2010 16:26:04 +0200 Message-ID: <87aasv5zsz.fsf@telefonica.net> References: <4BCF45FA.1060808@swipnet.se> <4BCFDE02.5090808@swipnet.se> <4BD01AC9.1000200@swipnet.se> <4BD0395F.7040500@swipnet.se> <87eii7629z.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1271946402 15378 80.91.229.12 (22 Apr 2010 14:26:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 14:26:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 22 16:26:39 2010 connect(): No such file or directory 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 1O4xMS-000695-AW for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 16:26:37 +0200 Original-Received: from localhost ([127.0.0.1]:54460 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4xMQ-0007TA-5r for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 10:26:34 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4xML-0007SY-IV for emacs-devel@gnu.org; Thu, 22 Apr 2010 10:26:29 -0400 Original-Received: from [140.186.70.92] (port=33338 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4xMF-0007QP-O1 for emacs-devel@gnu.org; Thu, 22 Apr 2010 10:26:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4xMA-0005qW-2c for emacs-devel@gnu.org; Thu, 22 Apr 2010 10:26:21 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:41660) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4xM9-0005qE-T5 for emacs-devel@gnu.org; Thu, 22 Apr 2010 10:26:18 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1O4xM7-0005se-Al for emacs-devel@gnu.org; Thu, 22 Apr 2010 16:26:15 +0200 Original-Received: from 83.42.12.8 ([83.42.12.8]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 22 Apr 2010 16:26:15 +0200 Original-Received: from ofv by 83.42.12.8 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 22 Apr 2010 16:26:15 +0200 X-Injected-Via-Gmane: http://gmane.org/ connect(): No such file or directory Original-Lines: 27 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.12.8 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:gpWvSmSa3kkR2k1QPhObFb2M8zM= 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:124045 Archived-At: Andreas Schwab writes: > Óscar Fuentes writes: > >> Remember that bzr considers the leftmost part of the DAG as a special >> one. > > As does git (see --first-parent). That is just a cosmetic feature. bzr makes the distinction by default and at a deeper level. On some common scenarios it can lead to an apparent history rewriting, with the DAG arms flipping sides. The bzr developers implemented a repo switch for rejecting that effect, and Emacs is using it. Which is precisely why `bzr push' won't work on a general basis. >> This is the reason why the Emacs repo is configured for rejecting >> `bzr push' except for the simple case where the operation would build a >> linear history on top of the previous one (i.e. a merge was >> unnecessary.) > > Either merge or fast-forward. That's exactly what you do with git as > well. We are talking about `push' here. `bzr push' works only if a fast-forward is possible. Same for `bzr pull'. From my reading of the man pages, git doesn't merge on `push' either.