##// END OF EJS Templates
merge: do the trivial resolution after updating sparse checkout...
merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

File last commit:

r13042:bd9bc412 stable
r38780:d49e490a @94 stable
Show More
doc.wxs
50 lines | 1.9 KiB | text/plain | TextLexer
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828
<Fragment>
Adrian Buehlmann
wix updates...
r10930 <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>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Fragment>
<Fragment>
Adrian Buehlmann
wix updates...
r10930 <DirectoryRef Id="INSTALLDIR">
<Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <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>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <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>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <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>
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Name="style.css" KeyPath="yes" />
</Component>
</Directory>
</DirectoryRef>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>