Submitter | Steve Borho |
---|---|
Date | May 6, 2017, 3:20 p.m. |
Message ID | <3ada044340be9652ce97.1494084036@localhost> |
Download | mbox | patch |
Permalink | /patch/20485/ |
State | Accepted |
Headers | show |
Comments
On Sat, May 06, 2017 at 10:20:36AM -0500, Steve Borho wrote: > # HG changeset patch > # User Steve Borho <steve@borho.org> > # Date 1494083914 18000 > # Sat May 06 10:18:34 2017 -0500 > # Branch stable > # Node ID 3ada044340be9652ce978d32c86a6ffda5194227 > # Parent 40785ccab41006f61039714d0d9b2ed09e401b2a > wix: only one KeyPath is allowed per Component Queued for stable, thanks. > > diff -r 40785ccab410 -r 3ada044340be contrib/wix/help.wxs > --- a/contrib/wix/help.wxs Wed May 03 22:56:53 2017 -0400 > +++ b/contrib/wix/help.wxs Sat May 06 10:18:34 2017 -0500 > @@ -40,7 +40,7 @@ > <Directory Id="help.internaldir" Name="internals"> > <Component Id="help.internals" Guid="$(var.help.internals.guid)" Win64='$(var.IsX64)'> > <File Id="internals.bundles.txt" Name="bundles.txt" KeyPath="yes" /> > - <File Id="internals.censor.txt" Name="censor.txt" KeyPath="yes" /> > + <File Id="internals.censor.txt" Name="censor.txt" /> > <File Id="internals.changegroups.txt" Name="changegroups.txt" /> > <File Id="internals.requirements.txt" Name="requirements.txt" /> > <File Id="internals.revlogs.txt" Name="revlogs.txt" /> > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Patch
diff -r 40785ccab410 -r 3ada044340be contrib/wix/help.wxs --- a/contrib/wix/help.wxs Wed May 03 22:56:53 2017 -0400 +++ b/contrib/wix/help.wxs Sat May 06 10:18:34 2017 -0500 @@ -40,7 +40,7 @@ <Directory Id="help.internaldir" Name="internals"> <Component Id="help.internals" Guid="$(var.help.internals.guid)" Win64='$(var.IsX64)'> <File Id="internals.bundles.txt" Name="bundles.txt" KeyPath="yes" /> - <File Id="internals.censor.txt" Name="censor.txt" KeyPath="yes" /> + <File Id="internals.censor.txt" Name="censor.txt" /> <File Id="internals.changegroups.txt" Name="changegroups.txt" /> <File Id="internals.requirements.txt" Name="requirements.txt" /> <File Id="internals.revlogs.txt" Name="revlogs.txt" />