##// 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:

r19023:86531a70 default
r28192:cb6a952e stable
Show More
i18n.wxs
26 lines | 739 B | text/plain | TextLexer
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <?xml version="1.0" encoding="utf-8"?>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 <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
Mads Kiilerich
codingstyle: remove trailing spaces in various text files...
r19023 <?define hg_po_langs =
Steve Borho
wix: add phases help text and two more translations (issue 3288)
r16220 da;de;el;fr;it;ja;pt_BR;ro;ru;sv;zh_CN;zh_TW
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 ?>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="i18ndir" Name="i18n" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
r13042 <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)" Win64='$(var.IsX64)'>
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 <File Name="hggettext" KeyPath="yes" />
<?foreach LANG in $(var.hg_po_langs) ?>
Mads Kiilerich
codingstyle: remove trailing spaces in various text files...
r19023 <File Id="hg.$(var.LANG).po"
Name="$(var.LANG).po"
Adrian Buehlmann
wix: refactor and new guids.wxi
r10828 />
<?endforeach?>
</Component>
</Directory>
</DirectoryRef>
</Fragment>
Adrian Buehlmann
contrib/wix: switch *.wxs files to LF eol
r10513 </Wix>