8000 Drop all hg-related questions from the FAQ. (#71) · python/devguide@2cf04e4 · GitHub
[go: up one dir, main page]

Skip to content

Commit 2cf04e4

Browse files
authored
Drop all hg-related questions from the FAQ. (#71)
Questions already moved were left. Otherwise Git is covered well enough online that we should avoid duplicating documenting anything that isn't specific to our suggested workflow.
1 parent 03ebeb8 commit 2cf04e4

File tree

3 files changed

+23
-409
lines changed

3 files changed

+23
-409
lines changed

committing.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,9 @@ issue's page in the tracker, for each mentioned issue.
248248
If "closes" (or "closed", or "closing") is prepended, the issue is
249249
automatically closed as "fixed".
250250

251+
.. _issue tracker: https://bugs.python.org
252+
253+
251254
Working with Git_
252255
=======================
253256

@@ -280,7 +283,7 @@ If you use Git as a committer of patches (your own or others), you should
280283
set up some basic options. Here are the minimal options you need to activate:
281284

282285
* Your *name* and *email*: these settings defines what will be used when you
283-
:ref:`commit <git-commit>` changes::
286+
commit changes::
284287

285288
git config --global user.name "Your Name"
286289
git config --global user.email email@example.org

coredev.rst

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ an existing one), you use the command::
183183

184184
``PATH`` is optional: if it is omitted, all changes in your working copy
185185
will be committed to the local repository. When you commit, be sure that all
186-
changes are desired by :ref:`reviewing them first <hg-status>`;
187-
also, when making commits that you intend to push to public repositories,
188-
you should **not** commit together unrelated changes.
186+
changes are desired by reviewing them first; also, when making commits that you
187+
intend to push to public repositories, you should **not** commit together
188+
unrelated changes.
189189

190190
To abort a commit that you are in the middle of, leave the message
191191
empty (i.e., close the text editor without adding any text for the
@@ -289,17 +289,13 @@ committing*.
289289
How do I undo the changes made in a recent commit?
290290
''''''''''''''''''''''''''''''''''''''''''''''''''
291291

292-
First, this should not happen if you take the habit of :ref:`reviewing changes
293-
<hg-status>` before committing them.
292+
First, this should not happen if you take the habit of reviewing changes before
293+
committing them.
294294

295295
In any case, run::
296296

297-
hg backout <revision number>
297+
git revert <revision number>
298298

299299
This will modify your working copy so that all changes in ``<revision number>``
300-
(including added or deleted files) are undone. You then need to :ref:`commit
301-
<hg-commit>` these changes so that the backout gets permanently recorded.
302-
303-
.. note::
304-
These instructions are for Mercurial 1.7 and higher. ``hg backout`` has
305-
a slightly different behaviour in versions before 1.7.
300+
(including added or deleted files) are undone. You then need to commit
301+
these changes so that the backout gets permanently recorded.

0 commit comments

Comments
 (0)
0