Submitter | phabricator |
---|---|
Date | Oct. 24, 2019, 1:56 a.m. |
Message ID | <differential-rev-PHID-DREV-etqu5tlrda2jy4jjiwsq-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/42556/ |
State | Superseded |
Headers | show |
Comments
martinvonz added a comment. I get this test failure from this commit: @@ -223,11 +223,6 @@ $ ( testrepohgenv; "$PYTHON" wixxml.py help ) Not installed: - help/common.txt - help/hg-ssh.8.txt - help/hg.1.txt - help/hgignore.5.txt - help/hgrc.5.txt Not tracked: $ ( testrepohgenv; "$PYTHON" wixxml.py templates ) ERROR: test-install.t output changed REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7166/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7166 To: indygreg, #hg-reviewers Cc: martinvonz, mercurial-devel
indygreg added a comment. indygreg added a subscriber: durin42. This got dropped on committed but Phabricator is confused about its closedstate. Please re-review and land @martinvonz or @durin42. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7166/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7166 To: indygreg, #hg-reviewers Cc: durin42, martinvonz, mercurial-devel
durin42 added a comment.
In D7166#108320 <https://phab.mercurial-scm.org/D7166#108320>, @indygreg wrote:
> This got dropped on committed but Phabricator is confused about its closedstate. Please re-review and land @martinvonz or @durin42.
Per Martin's comment, it looks like you had test failures?
(Phabricator only ever closes things - it never reopens them.)
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7166/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7166
To: indygreg, #hg-reviewers
Cc: durin42, martinvonz, mercurial-devel
durin42 added a comment. I re-landed this and tests passed on my workstation when I did so. Let's not drop this again without some additional coordination? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7166/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7166 To: indygreg, #hg-reviewers Cc: durin42, martinvonz, mercurial-devel
martinvonz added a comment.
In D7166#108360 <https://phab.mercurial-scm.org/D7166#108360>, @durin42 wrote:
> I re-landed this and tests passed on my workstation when I did so. Let's not drop this again without some additional coordination?
Agreed. I think it was I who pushed it last time and I must have done that before running tests, and then I dropped it after running tests. I'm sorry.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7166/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7166
To: indygreg, #hg-reviewers
Cc: durin42, martinvonz, mercurial-devel
durin42 added a comment. No worries, I'm not sure what went sideways there. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7166/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7166 To: indygreg, #hg-reviewers Cc: durin42, martinvonz, mercurial-devel
Patch
diff --git a/contrib/packaging/wix/help.wxs b/contrib/packaging/wix/help.wxs --- a/contrib/packaging/wix/help.wxs +++ b/contrib/packaging/wix/help.wxs @@ -17,6 +17,7 @@ <Component Id="help.root" Guid="$(var.help.root.guid)" Win64='$(var.IsX64)'> <File Name="bundlespec.txt" /> <File Name="color.txt" /> + <File Name="common.txt" /> <File Name="config.txt" KeyPath="yes" /> <File Name="dates.txt" /> <File Name="deprecated.txt" /> @@ -26,7 +27,11 @@ <File Name="filesets.txt" /> <File Name="flags.txt" /> <File Name="glossary.txt" /> + <File Name="hg-ssh.8.txt" /> + <File Name="hg.1.txt" /> + <File Name="hgignore.5.txt" /> <File Name="hgignore.txt" /> + <File Name="hgrc.5.txt" /> <File Name="hgweb.txt" /> <File Name="merge-tools.txt" /> <File Name="pager.txt" />