Patchwork D6528: tests: fix internals.mergestate entry

login
register
mail settings
Submitter phabricator
Date June 13, 2019, 5:39 p.m.
Message ID <7cca24a5f4834cbe459c4684d0a35bde@localhost.localdomain>
Download mbox | patch
Permalink /patch/40493/
State Not Applicable
Headers show

Comments

phabricator - June 13, 2019, 5:39 p.m.
navaneeth.suresh edited the summary of this revision.
navaneeth.suresh updated this revision to Diff 15492.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6528?vs=15491&id=15492

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6528/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6528

AFFECTED FILES
  contrib/packaging/wix/help.wxs
  tests/test-help.t

CHANGE DETAILS




To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel

Patch

diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -1078,6 +1078,7 @@ 
        changegroups  Changegroups
        config        Config Registrar
        extensions    Extension API
+       mergestate    Mergestate
        requirements  Repository Requirements
        revlogs       Revision Logs
        wireprotocol  Wire Protocol
@@ -3425,6 +3426,13 @@ 
   Extension API
   </td></tr>
   <tr><td>
+  <a href="/help/internals.mergestate">
+  mergestate
+  </a>
+  </td><td>
+  Mergestate
+  </td></tr>
+  <tr><td>
   <a href="/help/internals.requirements">
   requirements
   </a>
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
@@ -49,6 +49,7 @@ 
             <File Id="internals.config.txt"       Name="config.txt" />
             <File Id="internals.extensions.txt"   Name="extensions.txt" />
             <File Id="internals.linelog.txt"      Name="linelog.txt" />
+            <File Id="internals.mergestate.txt"   Name="mergestate.txt" />
             <File Id="internals.requirements.txt" Name="requirements.txt" />
             <File Id="internals.revlogs.txt"      Name="revlogs.txt" />
             <File Id="internals.wireprotocol.txt" Name="wireprotocol.txt" />