##// END OF EJS Templates
exchange: don't attempt phase exchange if phase-heads was in bundle...
exchange: don't attempt phase exchange if phase-heads was in bundle The Mercurial core server doesn't yet include phase-heads parts in the bundle, but our Google-internal server wants to do that. Unfortunately, the usual exchange still happens even if phase-heads part is included (including the short-circuited one for old/publishing servers). That means that even if our server (again, the Google-internal one, but also future Mercurial core servers) includes a phase-heads part to indicate that some heads should be drafts, that would still get overwritten by the phase updating that happens after. So let's fix that by marking the phase step done if we receive at least one phase-heads part in the bundle. Differential Revision: https://phab.mercurial-scm.org/D440

File last commit:

r22445:5716d10e default
r33887:13dc7f29 default
Show More
contrib.wxs
43 lines | 1.4 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>
<ComponentGroup Id="contribFolder">
<ComponentRef Id="contrib" />
<ComponentRef Id="contrib.vim" />
</ComponentGroup>
</Fragment>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="contribdir" Name="contrib" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="contrib" Guid="$(var.contrib.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="bash_completion" KeyPath="yes" />
<File Name="hgk" />
Steve Borho
wix: hgweb file renames
r11006 <File Name="hgweb.fcgi" />
<File Name="hgweb.wsgi" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="logo-droplets.svg" />
<File Name="mercurial.el" />
<File Name="tcsh_completion" />
<File Name="tcsh_completion_build.sh" />
<File Name="xml.rnc" />
<File Name="zsh_completion" />
</Component>
<Directory Id="vimdir" Name="vim">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="contrib.vim" Guid="$(var.contrib.vim.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="hg-menu.vim" KeyPath="yes" />
<File Name="HGAnnotate.vim" />
<File Name="hgcommand.vim" />
<File Name="patchreview.txt" />
<File Name="patchreview.vim" />
Steve Borho
wix: add vim syntax file for Mercurial unit tests
r12792 <File Name="hgtest.vim" />
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </Component>
</Directory>
</Directory>
</DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>