##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: disallow merge abort in case of an unfinished operation (issue6160)...
merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607
Gregory Szorc - - Load All Authors

File last commit:

r42086:c68a1df5 default
r42780:b8d54f46 default
Show More
i18n.wxs
26 lines | 739 B | text/plain | TextLexer
/ contrib / packaging / wix / i18n.wxs
History | Annotation | Raw |Copy content |Copy permalink
<?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;ro;ru;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>