[Python-checkins] devguide: Describe the Rdiff extension for remote diffs
nick.coghlan
python-checkins at python.org
Sun Feb 6 07:26:07 CET 2011
nick.coghlan pushed dfcbecf10237 to devguide:
http://hg.python.org/devguide/rev/dfcbecf10237
changeset: 242:dfcbecf10237
branch: hg_transition
tag: tip
user: Nick Coghlan <ncoghlan at gmail.com>
date: Sun Feb 06 16:25:40 2011 +1000
summary:
Describe the Rdiff extension for remote diffs
files:
faq.rst
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -106,7 +106,8 @@
This example is for a local repository that mirrors the ``devguide`` repository
on ``hg.python.org``. The same approach works for other remote repositories.
-How do I create a nickname for a remote repository?
+
+How do I create a shorthand alias for a remote repository?
-------------------------------------------------------------------------------
In your global ``.hgrc`` file add a section similar to the following::
@@ -118,7 +119,32 @@
on ``hg.python.org``. This allows "dg" to be entered instead of the
full URL for commands such as ``hg pull`.
-How do I update my working copy to be in sync with the repository?
+Anywhere that ``<remote repository>`` is used in the commands in this
+FAQ, ``hg`` should accept an alias in place of a complete remote URL.
+
+
+How do I compare my working copy to a remote repository?
+-------------------------------------------------------------------------------
+
+First, retrieve and enable the `Rdiff extension` for Mercurial.
+
+The following command will then show the effect of updating the working copy
+to match that remote repository::
+
+ hg diff <remote repository>``
+
+To instead see the effects of applying the changes in the current working copy
+to that remote repository, simply reverse the diff::
+
+ hg diff --reverse <remote repository>
+
+By executing them in a pristine working copy, these same commands work to
+diff the local repository against a remote repository.
+
+.. _Rdiff extension: http://mercurial.selenic.com/wiki/RdiffExtension
+
+
+How do I update my working copy to be in sync with a remote repository?
-------------------------------------------------------------------------------
Run::
--
Repository URL: http://hg.python.org/devguide
More information about the Python-checkins
mailing list