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

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

dirstate: fix filefoldmap incosistency on file delete...
dirstate: fix filefoldmap incosistency on file delete The _filefoldmap is not updated in when files are deleted from dirstate. In the case where the file with the same but differently cased name is added afterwards it renders _filefoldmap incorrect. Those steps must occur to for a problem to reproduce: - call status (with listunknown=True), - update working rectory to a commit which does a casefolding change (A -> a) - call status again (it will show the file "a" as deleted) Unfortunately I'm unable to write a test for it because I don't know any core-mercurial command able to reproduce those steps. The bug was originally spotted when hgwatchman was enabled. It caused the changeset contents change during hg rebase (one file unrelarted to changeset was deleted in it after rebase). The hgwatchman is able to hit it because when hgignore changes the hgwatchmans overridestatus is calling original status with listunknown=True.
Steve Borho - - Load All Authors

File last commit:

r25409:95e042d7 default
r26887:663eff02 stable
Show More
dist.wxs
35 lines | 1.3 KiB | text/plain | TextLexer
/ contrib / wix / dist.wxs
History | Source | Raw |Copy content |Copy permalink
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include guids.wxi ?>
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <?include defines.wxi ?>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041
<Fragment>
<DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)">
Steve Borho
wix: add support for x64 native MSI packages
 r13042 <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <File Name="python27.dll" KeyPath="yes" />
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 </Component>
Steve Borho
wix: move library.zip and all *.pyd into a lib/ folder...
 r25409 <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib">
<Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'>
<File Name="library.zip" KeyPath="yes" />
<File Name="mercurial.base85.pyd" />
<File Name="mercurial.bdiff.pyd" />
<File Name="mercurial.diffhelpers.pyd" />
<File Name="mercurial.mpatch.pyd" />
<File Name="mercurial.osutil.pyd" />
<File Name="mercurial.parsers.pyd" />
<File Name="pyexpat.pyd" />
<File Name="bz2.pyd" />
<File Name="select.pyd" />
<File Name="unicodedata.pyd" />
<File Name="_ctypes.pyd" />
<File Name="_elementtree.pyd" />
<File Name="_hashlib.pyd" />
<File Name="_socket.pyd" />
<File Name="_ssl.pyd" />
</Component>
</Directory>
Steve Borho
wix: switch Mercurial Windows installer to use py2exe --bundle 3...
 r13041 </DirectoryRef>
</Fragment>
</Wix>