##// END OF EJS Templates
revert: properly revert to ancestor of p2 during merge (issue5052)...
revert: properly revert to ancestor of p2 during merge (issue5052) During merge, added (from one perspective) file can be reported as "modified". To work around that, revert was testing if modified file were present in the parent manifest and marking them as "added" in this case. However, we should be checking against the target revision manifest instead. Otherwise see file as "newly added" even if they exist in the target revision. That revert behavior regressed in 06fbd9518bc5.

File last commit:

r13042:bd9bc412 stable
r28192:cb6a952e stable
Show More
locale.wxs
34 lines | 1.0 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
Steve Borho
wix: add support for x64 native MSI packages
r13042 <?include defines.wxi ?>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?define hglocales =
da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW
?>
<Fragment>
<ComponentGroup Id="localeFolder">
<?foreach LOC in $(var.hglocales) ?>
<ComponentRef Id="hg.locale.$(var.LOC)"/>
<?endforeach?>
</ComponentGroup>
</Fragment>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
Adrian Buehlmann
wix updates...
r10930 <Directory Id="localedir" Name="locale" FileSource="$(var.SourceDir)">
<?foreach LOC in $(var.hglocales) ?>
<Directory Id="hg.locale.$(var.LOC)" Name="$(var.LOC)">
<Directory Id="hg.locale.$(var.LOC).LC_MESSAGES" Name="LC_MESSAGES">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="hg.locale.$(var.LOC)" Guid="*" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix updates...
r10930 <File Id="hg.mo.$(var.LOC)" Name="hg.mo" KeyPath="yes" />
</Component>
</Directory>
</Directory>
<?endforeach?>
</Directory>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 </DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>