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: incorrect working revision for the mercurial VC backend Date: Wed, 30 Dec 2009 03:02:37 -0500 Message-ID: References: <19258.47991.673928.374725@totara.tehura.co.nz> <19258.52278.890330.878259@totara.tehura.co.nz> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1262160495 18581 80.91.229.12 (30 Dec 2009 08:08:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Dec 2009 08:08:15 +0000 (UTC) Cc: nickrob@snap.net.nz, emacs-devel@gnu.org To: Alex Harsanyi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 30 09:08:08 2009 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 1NPtbC-0007KT-JT for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 09:08:06 +0100 Original-Received: from localhost ([127.0.0.1]:39537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPtbD-0001Ky-0t for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 03:08:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NPtb2-0001IL-Tl for emacs-devel@gnu.org; Wed, 30 Dec 2009 03:07:57 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NPtax-0001G2-EE for emacs-devel@gnu.org; Wed, 30 Dec 2009 03:07:55 -0500 Original-Received: from [199.232.76.173] (port=47738 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPtax-0001Fx-8n for emacs-devel@gnu.org; Wed, 30 Dec 2009 03:07:51 -0500 Original-Received: from [140.186.70.10] (port=37841 helo=fencepost.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NPtax-0002F0-2P for emacs-devel@gnu.org; Wed, 30 Dec 2009 03:07:51 -0500 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NPtVt-0004dW-6F; Wed, 30 Dec 2009 03:02:37 -0500 In-reply-to: (message from Alex Harsanyi on Wed, 30 Dec 2009 14:15:05 +0800) 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:119025 Archived-At: > Date: Wed, 30 Dec 2009 14:15:05 +0800 > From: Alex Harsanyi > Cc: emacs-devel@gnu.org > > On Wed, Dec 30, 2009 at 11:42 AM, Nick Roberts wrote: > > [please cc the mailing list] > > > >  > I haven't switched yet to bzr, so I cannot pull the change, however > >  > the patch corresponds to my local fix, except that the last line > >  > reads: > > > > But you could apply the patch to your working copy. > > I could not apply it. If I copy-paste it out of the email, patch rejects it: > > $ patch -p1 < vc-hg.patch > patching file vc-hg.el > Hunk #1 FAILED at 209. > 1 out of 1 hunk FAILED -- saving rejects to file vc-hg.el.rej > > When I try to apply it from Emacs, it asks me first if I want to fix > word-wrap damage, but after I say yes, it fails anyway... Sorry but > I'm not sure what is wrong. Perhaps try "patch --ignore-whitespace".