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: merge conlict? Date: Tue, 26 Jan 2010 10:29:30 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264498197 25925 80.91.229.12 (26 Jan 2010 09:29:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 09:29:57 +0000 (UTC) Cc: Eli Zaretskii , "Mark A. Hershberger" , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 10:29:49 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 1NZhk3-0003nv-Te for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 10:29:48 +0100 Original-Received: from localhost ([127.0.0.1]:39170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZhk5-0005m3-0I for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 04:29:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZhjy-0005km-IC for emacs-devel@gnu.org; Tue, 26 Jan 2010 04:29:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZhjt-0005gv-50 for emacs-devel@gnu.org; Tue, 26 Jan 2010 04:29:41 -0500 Original-Received: from [199.232.76.173] (port=45723 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZhjs-0005ge-S6 for emacs-devel@gnu.org; Tue, 26 Jan 2010 04:29:36 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:40927) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZhjq-0000B1-S7; Tue, 26 Jan 2010 04:29:35 -0500 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 EEC4B1C0028E; Tue, 26 Jan 2010 10:29:31 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id BE437901F6; Tue, 26 Jan 2010 10:29:31 +0100 (CET) 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 IseKtIG2k-3o; Tue, 26 Jan 2010 10:29:31 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.144.89.ip-pool.NEFkom.net [83.171.144.89]) by mail.mnet-online.de (Postfix) with ESMTP; Tue, 26 Jan 2010 10:29:30 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id BA06ECA296; Tue, 26 Jan 2010 10:29:30 +0100 (CET) X-Yow: .. One FISHWICH coming up!! In-Reply-To: (Stefan Monnier's message of "Mon, 25 Jan 2010 22:02:46 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.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:120425 Archived-At: Stefan Monnier writes: > I've just added > > append_revisions_only = True > > to the .../trunk/.bzr/branch/branch.conf which should reject a "bzr > push" that does this kind of ancestor-shifting. That setting has no influence. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."