Mercurial > hg
view contrib/wix/doc.wxs @ 12317:ed639917c825 stable
test-eol-update: record new results as correct
Changeset 0852da25a31b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.
Previously, it used the .hgeol contents from the working directory before the
update.
author | Steve Borho <steve@borho.org> |
---|---|
date | Fri, 17 Sep 2010 12:44:35 -0500 |
parents | 230ab9a23594 |
children | bd9bc4123920 |
line wrap: on
line source
<?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include guids.wxi ?> <Fragment> <ComponentGroup Id="docFolder"> <ComponentRef Id="doc.hg.1.html" /> <ComponentRef Id="doc.hgignore.5.html" /> <ComponentRef Id="doc.hgrc.5.html" /> <ComponentRef Id="doc.style.css" /> </ComponentGroup> </Fragment> <Fragment> <DirectoryRef Id="INSTALLDIR"> <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)"> <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)"> <File Name="hg.1.html" KeyPath="yes"> <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir" Name="Mercurial Command Reference" Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> </File> </Component> <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)"> <File Name="hgignore.5.html" KeyPath="yes"> <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir" Name="Mercurial Ignore Files" Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> </File> </Component> <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)"> <File Name="hgrc.5.html" KeyPath="yes"> <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir" Name="Mercurial Configuration Files" Icon="hgIcon.ico" IconIndex="0" Advertise="yes" /> </File> </Component> <Component Id="doc.style.css" Guid="$(var.doc.style.css)"> <File Name="style.css" KeyPath="yes" /> </Component> </Directory> </DirectoryRef> </Fragment> </Wix>