From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: bzr: just give me a context diff, will you? Date: Thu, 22 Apr 2010 09:50:57 +0000 Message-ID: <20100422095056.GA2668@muc.de> 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 1271930158 15774 80.91.229.12 (22 Apr 2010 09:55:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 22 Apr 2010 09:55:58 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 22 11:55: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 1O4t8W-00014i-FM for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 11:55:56 +0200 Original-Received: from localhost ([127.0.0.1]:52517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4t8W-0002ct-0O for ged-emacs-devel@m.gmane.org; Thu, 22 Apr 2010 05:55:56 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4t2K-0008PR-Oe for emacs-devel@gnu.org; Thu, 22 Apr 2010 05:49:32 -0400 Original-Received: from [140.186.70.92] (port=59240 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4t2J-0008P3-GS for emacs-devel@gnu.org; Thu, 22 Apr 2010 05:49:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4t2I-0007rM-KJ for emacs-devel@gnu.org; Thu, 22 Apr 2010 05:49:31 -0400 Original-Received: from colin.muc.de ([193.149.48.1]:3736 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4t2I-0007r1-A3 for emacs-devel@gnu.org; Thu, 22 Apr 2010 05:49:30 -0400 Original-Received: (qmail 91359 invoked by uid 3782); 22 Apr 2010 09:42:07 -0000 Original-Received: from acm.muc.de (pD9E50EF9.dip.t-dialin.net [217.229.14.249]) by colin2.muc.de (tmda-ofmipd) with ESMTP; Thu, 22 Apr 2010 11:42:06 +0200 Original-Received: (qmail 2712 invoked by uid 1000); 22 Apr 2010 09:50:57 -0000 Content-Disposition: inline In-Reply-To: <83pr1u3qvm.fsf@gnu.org> User-Agent: Mutt/1.5.9i X-Delivery-Agent: TMDA/1.1.5 (Fettercairn) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 4.6-4.9 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:124027 Archived-At: Hi, Eli and everybody else, On Tue, Apr 20, 2010 at 09:45:01PM +0300, Eli Zaretskii wrote: > > 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.) Thanks for this! _Maybe_ R'ingTFM would have been faster than hacking the source. -- Alan Mackenzie (Nuremberg, Germany).