From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: VC and bzr. Date: Thu, 22 Apr 2010 15:51:14 +0200 Message-ID: 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: quoted-printable X-Trace: dough.gmane.org 1271945443 11231 80.91.229.12 (22 Apr 2010 14:10:43 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 14:10:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 22 16:10:41 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 1O4x72-0005hH-6u for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 16:10:40 +0200 Original-Received: from localhost ([127.0.0.1]:36939 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4x71-0008UD-5H for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 10:10:39 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4x6v-0008Tf-HK for emacs-devel@gnu.org; Thu, 22 Apr 2010 10:10:33 -0400 Original-Received: from [140.186.70.92] (port=52639 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4x6t-0008T1-KI for emacs-devel@gnu.org; Thu, 22 Apr 2010 10:10:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4woK-0000AZ-7s for emacs-devel@gnu.org; Thu, 22 Apr 2010 09:51:42 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:45769) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4woK-0000AH-2Y for emacs-devel@gnu.org; Thu, 22 Apr 2010 09:51:20 -0400 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 0E6F71C004A5; Thu, 22 Apr 2010 15:51:19 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id EF9F49025B; Thu, 22 Apr 2010 15:51:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id VQB0eP-+Cq8y; Thu, 22 Apr 2010 15:51:14 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-105-17.dynamic.mnet-online.de [88.217.105.17]) by mail.mnet-online.de (Postfix) with ESMTP; Thu, 22 Apr 2010 15:51:14 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id AB9ADCA297; Thu, 22 Apr 2010 15:51:14 +0200 (CEST) X-Yow: Loni Anderson's hair should be LEGALIZED!! In-Reply-To: <87eii7629z.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Thu, 22 Apr 2010 15:32:40 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.96 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:124043 Archived-At: =C3=93scar Fuentes writes: > Remember that bzr considers the leftmost part of the DAG as a special > one. As does git (see --first-parent). > 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. Andreas. --=20 Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED= 5 "And now for something completely different."