From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alex Harsanyi Newsgroups: gmane.emacs.devel Subject: Re: incorrect working revision for the mercurial VC backend Date: Wed, 30 Dec 2009 17:37:45 +0800 Message-ID: References: <19258.47991.673928.374725@totara.tehura.co.nz> <19258.52278.890330.878259@totara.tehura.co.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262165895 31064 80.91.229.12 (30 Dec 2009 09:38:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 30 Dec 2009 09:38:15 +0000 (UTC) Cc: nickrob@snap.net.nz, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 30 10:38:07 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 1NPv0H-0000EN-Nf for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 10:38:06 +0100 Original-Received: from localhost ([127.0.0.1]:41240 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPv0H-0003gI-SS for ged-emacs-devel@m.gmane.org; Wed, 30 Dec 2009 04:38:05 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NPv0A-0003fg-LY for emacs-devel@gnu.org; Wed, 30 Dec 2009 04:37:58 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NPv04-0003dr-Pm for emacs-devel@gnu.org; Wed, 30 Dec 2009 04:37:57 -0500 Original-Received: from [199.232.76.173] (port=58999 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NPv04-0003dm-K0 for emacs-devel@gnu.org; Wed, 30 Dec 2009 04:37:52 -0500 Original-Received: from mail-yx0-f191.google.com ([209.85.210.191]:63519) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NPuzy-0005xE-6v; Wed, 30 Dec 2009 04:37:46 -0500 Original-Received: by yxe29 with SMTP id 29so33575928yxe.14 for ; Wed, 30 Dec 2009 01:37:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=1bHmZchIrlPY6ax11Yv3rFiAdmPynoFphvRWdqcUQL8=; b=f+JgtQGPKYBu1afQAJHn1Y6vjHsIQ4IvrO2yOsaW5+hWjRYL2tGxQjIviBQuyUklrJ fw7OAZZHDOCS9IdkwNkUhveeSJCtWx5S7WsYnHW1VijK5HLGKVyU6jeCLGiFmeIU7xq5 vzF4R+43IY4gcVgltS1Gq0wiDyR8KzbgNsZpg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=hoKxBQKSHvma7Bt07utUwr4R57kjSItFAP0VsYnCYMhs83MxNvhPBV826DkG9cCxQm vMkbqhvbaC4WvyrawWBVlpNfPXshUXf8f/X5LxsP8BKQX7H2ff6QDMpmP/ZoBZr3NA6H yC24iJC/uJ5DAtMwnGeCRDVD4bGULEBvBjwVc= Original-Received: by 10.151.89.34 with SMTP id r34mr20019147ybl.27.1262165865438; Wed, 30 Dec 2009 01:37:45 -0800 (PST) In-Reply-To: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:119028 Archived-At: On Wed, Dec 30, 2009 at 4:02 PM, Eli Zaretskii wrote: >> 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 wro= te: >> > [please cc the mailing list] >> > >> > =A0> I haven't switched yet to bzr, so I cannot pull the change, howev= er >> > =A0> the patch corresponds to my local fix, except that the last line >> > =A0> 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". > That worked, thanks. BTW, I did use the latest CVS version, and I do plan to switch to bzr, except I will only have the time in a few weeks time Cheers, Alex.