From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: bzr: just give me a context diff, will you? Date: Tue, 20 Apr 2010 14:43:12 -0400 Message-ID: References: <20100420180003.GA2785@muc.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1271789030 32148 80.91.229.12 (20 Apr 2010 18:43:50 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 18:43:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 20 20:43: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 1O4IQ7-0007if-7P for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 20:43:39 +0200 Original-Received: from localhost ([127.0.0.1]:50515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4IQ6-0006zC-OL for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 14:43:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4IQ0-0006z3-6q for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:43:32 -0400 Original-Received: from [140.186.70.92] (port=50056 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4IPx-0006yF-QW for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:43:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4IPw-0002ca-3W for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:43:29 -0400 Original-Received: from tomts13-srv.bellnexxia.net ([209.226.175.34]:57479) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4IPv-0002c3-O8 for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:43:28 -0400 Original-Received: from toip3.srvr.bell.ca ([209.226.175.86]) by tomts13-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20100420184316.VXUX12176.tomts13-srv.bellnexxia.net@toip3.srvr.bell.ca> for ; Tue, 20 Apr 2010 14:43:16 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvsEAMOPzUtGN5OL/2dsb2JhbACcAHK9EoUPBA Original-Received: from bas1-montreal42-1178047371.dsl.bell.ca (HELO ceviche.home) ([70.55.147.139]) by toip3.srvr.bell.ca with ESMTP; 20 Apr 2010 14:35:28 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 318C7660D2; Tue, 20 Apr 2010 14:43:12 -0400 (EDT) In-Reply-To: <20100420180003.GA2785@muc.de> (Alan Mackenzie's message of "Tue, 20 Apr 2010 18:00:03 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Solaris 8 (1) 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:123933 Archived-At: > The project standard for diff output is a context diff, not a unified > diff. By default, bzr unfortunately outputs unified. > For anybody else who finds typing "--diff-options='-c'" intolerably > long-winded, You can set up such default options in your ~/.bazaar/bazaar.conf file. E.g. the two lines below should do it. [ALIASES] diff=diff --diff-options=-c -- Stefan "who prefers unified diffs"