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

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

resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035
Matt Harbison - - Load All Authors

File last commit:

r32461:14e8fef9 stable
r38817:bb54db4a @96 default
Show More
locale.wxs
34 lines | 1.0 KiB | text/plain | TextLexer
/ contrib / wix / locale.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 defines.wxi ?>
<?define hglocales =
da;de;el;fr;it;ja;pt_BR;ro;ru;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">
<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">
<Component Id="hg.locale.$(var.LOC)" Guid="*" Win64='$(var.IsX64)'>
<File Id="hg.mo.$(var.LOC)" Name="hg.mo" KeyPath="yes" />
</Component>
</Directory>
</Directory>
<?endforeach?>
</Directory>
</DirectoryRef>
</Fragment>
</Wix>