[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: incorrect working revision for the mercurial VC backend
From: |
Alex Harsanyi |
Subject: |
Re: incorrect working revision for the mercurial VC backend |
Date: |
Wed, 30 Dec 2009 17:37:45 +0800 |
On Wed, Dec 30, 2009 at 4:02 PM, Eli Zaretskii <address@hidden> wrote:
>> Date: Wed, 30 Dec 2009 14:15:05 +0800
>> From: Alex Harsanyi <address@hidden>
>> Cc: address@hidden
>>
>> On Wed, Dec 30, 2009 at 11:42 AM, Nick Roberts <address@hidden> 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.
Re: incorrect working revision for the mercurial VC backend, Dan Nicolaescu, 2009/12/29