This is an archive of the discontinued LLVM Phabricator instance.

Differential D63023

[docs] Add 'git llvm revert' to getting started guide
ClosedPublic

Authored by rupprecht on Jun 7 2019, 12:58 PM.

Details

Reviewers
jyknight
mehdi_amini
Commits
rG13d16b94c6b7: [docs] Add 'git llvm revert' to getting started guide
rL362966: [docs] Add 'git llvm revert' to getting started guide
Summary

This documents git llvm revert rNNNNNN in the getting started guide for broader visibility.

Diff Detail

Event Timeline

rupprecht created this revision.Jun 7 2019, 12:58 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 7 2019, 12:58 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B33076: Diff 203604.Jun 7 2019, 12:59 PM
mehdi_amini accepted this revision.Jun 7 2019, 4:58 PM

LGTM, thanks!

This revision is now accepted and ready to land.Jun 7 2019, 4:58 PM
Closed by commit rL362966: [docs] Add 'git llvm revert' to getting started guide (authored by rupprecht). · Explain WhyJun 10 2019, 9:59 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
docs/
20 lines

Diff 203604

llvm/docs/GettingStarted.rst

Show First 20 Lines • Show All 519 Lines • ▼ Show 20 Lines
downloaded back to your repository. The SVN revision numbers of each commit can downloaded back to your repository. The SVN revision numbers of each commit can
be found at the end of the commit message, e.g. ``llvm-svn: 350914``. be found at the end of the commit message, e.g. ``llvm-svn: 350914``.
You may also find the ``-n`` flag useful, like ``git llvm push -n``. This runs You may also find the ``-n`` flag useful, like ``git llvm push -n``. This runs
through all the steps of committing _without_ actually doing the commit, and through all the steps of committing _without_ actually doing the commit, and
tell you what it would have done. That can be useful if you're unsure whether tell you what it would have done. That can be useful if you're unsure whether
the right thing will happen. the right thing will happen.
Reverting a change when using Git
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
If you're using Git and need to revert a patch, Git needs to be supplied a
commit hash, not an svn revision. To make things easier, you can use
``git llvm revert`` to revert with either an SVN revision or a Git hash instead.
Additionally, you can first run with ``git llvm revert -n`` to print which Git
commands will run, without doing anything.
Running ``git llvm revert`` will only revert things in your local repository. To
push the revert upstream, you still need to run ``git llvm push`` as described
earlier.
.. code-block:: console
% git llvm revert rNNNNNN # Revert by SVN id
% git llvm revert abcdef123456 # Revert by Git commit hash
% git llvm revert -n rNNNNNN # Print the commands without doing anything
Checkout via SVN (deprecated) Checkout via SVN (deprecated)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Until we have fully migrated to Git, you may also get a fresh copy of Until we have fully migrated to Git, you may also get a fresh copy of
the code from the official Subversion repository. the code from the official Subversion repository.
* ``cd where-you-want-llvm-to-live`` * ``cd where-you-want-llvm-to-live``
* Read-Only: ``svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm`` * Read-Only: ``svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm``
▲ Show 20 Lines • Show All 581 Lines • Show Last 20 Lines