unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Alex Harsanyi <alexharsanyi@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: nickrob@snap.net.nz, emacs-devel@gnu.org
Subject: Re: incorrect working revision for the mercurial VC backend
Date: Wed, 30 Dec 2009 17:37:45 +0800	[thread overview]
Message-ID: <cf628bc60912300137x57d0632bu4a3b1dc27e5d968b@mail.gmail.com> (raw)
In-Reply-To: <E1NPtVt-0004dW-6F@fencepost.gnu.org>

On Wed, Dec 30, 2009 at 4:02 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Wed, 30 Dec 2009 14:15:05 +0800
>> From: Alex Harsanyi <alexharsanyi@gmail.com>
>> Cc: emacs-devel@gnu.org
>>
>> On Wed, Dec 30, 2009 at 11:42 AM, Nick Roberts <nickrob@snap.net.nz> 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".
>

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.




  reply	other threads:[~2009-12-30  9:37 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-30  1:53 incorrect working revision for the mercurial VC backend Alex Harsanyi
2009-12-30  2:31 ` Nick Roberts
     [not found]   ` <cf628bc60912291930x46faaa61j488e15cc5b953689@mail.gmail.com>
2009-12-30  3:42     ` Nick Roberts
2009-12-30  6:15       ` Alex Harsanyi
2009-12-30  7:02         ` Nick Roberts
2009-12-30  8:02         ` Eli Zaretskii
2009-12-30  9:37           ` Alex Harsanyi [this message]
2009-12-30  3:29 ` Dan Nicolaescu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cf628bc60912300137x57d0632bu4a3b1dc27e5d968b@mail.gmail.com \
    --to=alexharsanyi@gmail.com \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=nickrob@snap.net.nz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).