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: merge conlict? Date: Tue, 26 Jan 2010 11:10:07 +0100 Message-ID: <87ockhw51c.fsf@telefonica.net> 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 1264500930 2057 80.91.229.12 (26 Jan 2010 10:15:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 10:15:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 11:15: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.50) id 1NZiSA-00031S-C6 for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 11:15:22 +0100 Original-Received: from localhost ([127.0.0.1]:59344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZiSA-0000hD-VF for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 05:15:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZiS5-0000ga-72 for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:15:17 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZiS0-0000fa-H3 for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:15:16 -0500 Original-Received: from [199.232.76.173] (port=49227 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZiS0-0000fX-9K for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:15:12 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:55933) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZiS0-0005Bx-16 for emacs-devel@gnu.org; Tue, 26 Jan 2010 05:15:12 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZiRt-0002u5-5h for emacs-devel@gnu.org; Tue, 26 Jan 2010 11:15:05 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Jan 2010 11:15:05 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 26 Jan 2010 11:15:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 15 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:2Uz9ETZbO5/sl2OtQQq+dbKFDUE= X-detected-operating-system: by monty-python.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:120427 Archived-At: Andreas Schwab writes: > 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. bzr developers says it has. Have you tried it? Can you describe how it failed?