contrib/wix/i18n.wxs

subrepo: fix for merge inconsistencies

Merging ancestors with children is allowed if they are on different
named branches. This did not work for subrepo merges before. To fix
this inconsistency, the mergefunc() will now use the simple update
path only if both versions are on the same named branch. If not, they
get merged into a new changeset, just as if you did the merge from the
subrepo's root directly.

<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

  <?include guids.wxi ?>
  <?include defines.wxi ?>

  <?define hg_po_langs = 
    da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW
  ?>

  <Fragment>
    <DirectoryRef Id="INSTALLDIR">
      <Directory Id="i18ndir" Name="i18n" FileSource="$(var.SourceDir)">
        <Component Id="i18nFolder" Guid="$(var.i18nFolder.guid)" Win64='$(var.IsX64)'>
          <File Name="hggettext" KeyPath="yes" />
          <?foreach LANG in $(var.hg_po_langs) ?>
            <File Id="hg.$(var.LANG).po" 
                  Name="$(var.LANG).po" 
            />
          <?endforeach?>
        </Component>
      </Directory>
    </DirectoryRef>
  </Fragment>

</Wix>