Remove outdated Mercurial references (#799)

Author: Erlend Egeberg Aasland

gitbootcamp.rst

@@ -344,30 +344,30 @@ When it happens, you need to resolve conflict.  See these articles about resolvi
 - `About merge conflicts <https://help.github.com/en/articles/about-merge-conflicts>`_
 - `Resolving a merge conflict using the command line <https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line>`_
 
-.. _git_from_mercurial:
+.. _git_from_patch:
 
-Applying a Patch from Mercurial to Git
---------------------------------------
+Applying a Patch to Git
+-----------------------
 
 Scenario:
 
-- A Mercurial patch exists but there is no pull request for it.
+- A patch exists but there is no pull request for it.
 
 Solution:
 
 1. Download the patch locally.
 
 2. Apply the patch::
 
-       git apply /path/to/issueNNNN-git.patch
+       git apply /path/to/patch.diff
 
    If there are errors, update to a revision from when the patch was
    created and then try the ``git apply`` again:
 
    .. code-block:: bash
 
        git checkout $(git rev-list -n 1 --before="yyyy-mm-dd hh:mm:ss" main)
-       git apply /path/to/issueNNNN-git.patch
+       git apply /path/to/patch.diff
 
    If the patch still won't apply, then a patch tool will not be able to
    apply the patch and it will need to be re-implemented manually.
@@ -382,6 +382,9 @@ Solution:
        git rebase main
        git mergetool
 
+   For very old changes, ``git merge --no-ff`` may be easier than a rebase,
+   with regards to resolving conflicts.
+
 6. Push the changes and open a pull request.
 
 .. _git_pr:

pullrequest.rst

@@ -394,7 +394,7 @@ Author Name <email_address> ." to the pull request description and commit messag
 See `the GitHub article <https://help.github.com/articles/creating-a-commit-with-multiple-authors/>`_
 on how to properly add the co-author info.
 
-See also :ref:`Applying a Patch from Mercurial to Git <git_from_mercurial>`.
+See also :ref:`Applying a Patch to Git <git_from_patch>`.
 
 Reviewing
 ---------

triaging.rst

@@ -505,13 +505,9 @@ with the "open" status.
 
 Mercurial Repository
 ''''''''''''''''''''
-HTTP link to a Mercurial repository that contains a patch for the issue.
-A :guilabel:`Create Patch` button will appear that computes a diff for the
-head revision of the remote branch and attaches it to the issue.  The button
-supports only CPython_ patches.
+Deprecated: HTTP link to a Mercurial repository that contains a patch for the issue.
 
-If you don't indicate a remote branch, ``default`` is used.  You can
-indicate a remote branch by adding ``#BRANCH`` to the end of the URL.
+New repository links should not be added to new or existing issues.
 
 GitHub PR
 '''''''''