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: bzr: just give me a context diff, will you? Date: Tue, 20 Apr 2010 22:02:58 +0200 Message-ID: References: <20100420180003.GA2785@muc.de> <83pr1u3qvm.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1271793875 20812 80.91.229.12 (20 Apr 2010 20:04:35 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 20 Apr 2010 20:04:35 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 20 22:04:34 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 1O4JgQ-0007HU-4D for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 22:04:34 +0200 Original-Received: from localhost ([127.0.0.1]:38200 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4JgP-0004oZ-Bp for ged-emacs-devel@m.gmane.org; Tue, 20 Apr 2010 16:04:33 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4JfH-0004JP-Qg for emacs-devel@gnu.org; Tue, 20 Apr 2010 16:03:23 -0400 Original-Received: from [140.186.70.92] (port=37861 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4JfG-0004IF-0W for emacs-devel@gnu.org; Tue, 20 Apr 2010 16:03:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4JfE-0003ZI-1o for emacs-devel@gnu.org; Tue, 20 Apr 2010 16:03:21 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:33197) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4Jew-0003UZ-9N; Tue, 20 Apr 2010 16:03:02 -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 AFE131C001EC; Tue, 20 Apr 2010 22:02:59 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 9D4739020A; Tue, 20 Apr 2010 22:02:59 +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 65k7EY35bgn7; Tue, 20 Apr 2010 22:02:58 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-122-104.dynamic.mnet-online.de [88.217.122.104]) by mail.mnet-online.de (Postfix) with ESMTP; Tue, 20 Apr 2010 22:02:58 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 32773CA297; Tue, 20 Apr 2010 22:02:58 +0200 (CEST) X-Yow: FROZEN ENTREES may be flung by members of opposing SWANSON SECTS.. In-Reply-To: <83pr1u3qvm.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 20 Apr 2010 21:45:01 +0300") 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:123937 Archived-At: Eli Zaretskii writes: >> 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 $ bzr alias diff="diff --diff-options -c" 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."