[PATCH STABLE] wix: avoid an abort with 'hg help -k foo'

[Pierre-Yves David]

On 09/01/2015 10:04 AM, Augie Fackler wrote:
> On Tue, Sep 01, 2015 at 11:54:22AM -0400, Matt Harbison wrote:
>> # HG changeset patch
>> # User Matt Harbison <matt_harbison at yahoo.com>
>> # Date 1441121948 14400
>> #      Tue Sep 01 11:39:08 2015 -0400
>> # Branch stable
>> # Node ID e03407fc5121c3f6ad97c62cb103d622926e594d
>> # Parent  006870583088a4767bcaa77903e9607ceb480cba
>> wix: avoid an abort with 'hg help -k foo'

Could we build a test checking all documentation.txt are refered there?

>
> Queued for stable, thanks.
>
>>
>> Previously:
>>
>>   $ /c/Program\ Files/Mercurial/hg help -k merge-tools
>>   abort: No such file or directory: c:\Program Files\Mercurial\help\scripting.txt
>>
>> The Inno installer seems OK, but the TortoiseHg required the same fix.  That got
>> queued with an additional change of 'helpFolder.guid' in guids.wxi (probably by
>> Steve).  I'm not sure if that is necessary here too.
>>
>> diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs
>> --- a/contrib/wix/help.wxs
>> +++ b/contrib/wix/help.wxs
>> @@ -23,6 +23,7 @@
>>             <File Name="phases.txt" />
>>             <File Name="revisions.txt" />
>>             <File Name="revsets.txt" />
>> +          <File Name="scripting.txt" />
>>             <File Name="subrepos.txt" />
>>             <File Name="templates.txt" />
>>             <File Name="urls.txt" />
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at selenic.com
>> https://selenic.com/mailman/listinfo/mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel
>

-- 
Pierre-Yves David