Skip to content

Drop all hg-related questions from the FAQ. #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettcannon merged 1 commit into from
Oct 28, 2016
Merged

Drop all hg-related questions from the FAQ. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion committing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,9 @@ issue's page in the tracker, for each mentioned issue.
If "closes" (or "closed", or "closing") is prepended, the issue is
automatically closed as "fixed".

.. _issue tracker: https://bugs.python.org


Working with Git_
=======================

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

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

git config --global user.name "Your Name"
git config --global user.email email@example.org
Expand Down
20 changes: 8 additions & 12 deletions coredev.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ an existing one), you use the command::

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

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

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

In any case, run::

hg backout <revision number>
git revert <revision number>

This will modify your working copy so that all changes in ``<revision number>``
(including added or deleted files) are undone. You then need to :ref:`commit
<hg-commit>` these changes so that the backout gets permanently recorded.

.. note::
These instructions are for Mercurial 1.7 and higher. ``hg backout`` has
a slightly different behaviour in versions before 1.7.
(including added or deleted files) are undone. You then need to commit
these changes so that the backout gets permanently recorded.
Loading