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

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

rebase: allow aborting if last-message.txt is missing...
rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.
Mads Kiilerich - - Load All Authors

File last commit:

r19023:86531a70 default
r31225:749b057b default
Show More
i18n.wxs
26 lines | 739 B | text/plain | TextLexer
/ contrib / wix / i18n.wxs
History | Source | Raw |Copy content |Copy permalink
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>