From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bzr: just give me a context diff, will you? Date: Tue, 20 Apr 2010 21:45:01 +0300 Message-ID: <83pr1u3qvm.fsf@gnu.org> References: <20100420180003.GA2785@muc.de> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1271789158 32673 80.91.229.12 (20 Apr 2010 18:45:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 18:45:58 +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:45:56 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 1O4ISJ-0000Cd-IQ for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 20:45:56 +0200 Original-Received: from localhost ([127.0.0.1]:51040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4ISI-00081N-PX for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 14:45:54 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4ISD-00080F-1h for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:45:49 -0400 Original-Received: from [140.186.70.92] (port=48210 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4ISA-0007yy-Dj for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:45:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4IS8-0003H4-A3 for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:45:46 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:56161) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4IS8-0003Gr-2k for emacs-devel@gnu.org; Tue, 20 Apr 2010 14:45:44 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0L1600C00UIALC00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Tue, 20 Apr 2010 21:44:58 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.237.174]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L1600981UQUPBB0@a-mtaout21.012.net.il>; Tue, 20 Apr 2010 21:44:55 +0300 (IDT) In-reply-to: <20100420180003.GA2785@muc.de> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:123934 Archived-At: > Date: Tue, 20 Apr 2010 18:00:03 +0000 > From: Alan Mackenzie > > For anybody else who finds typing "--diff-options='-c'" intolerably > long-winded, here is a quick hack in bzr to make context diffs the > default. The file is ..../bzr-2.1.0/bzrlib/diff.py. You don't need to hack Bazaar to get this. Just edit your ~/.bazaar/bazaar.conf file and add this: [ALIASES] diff=diff --diff-options -c (If you already have the ALIASES section, you only need the second line.)