[Python-checkins] merge in devguide (hg_transition): merge
georg.brandl
python-checkins at python.org
Tue Mar 1 20:54:09 CET 2011
http://hg.python.org/devguide/rev/d8c44ecfd34f
changeset: 356:d8c44ecfd34f
branch: hg_transition
parent: 355:f982319c30a6
parent: 354:d57ea38b300e
user: Georg Brandl <georg at python.org>
date: Tue Mar 01 20:53:00 2011 +0100
summary:
merge
files:
index.rst
diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -1,7 +1,7 @@
.. _committing:
-Committing Patches
-==================
+Committing and Pushing Changes
+==============================
Commit Messages
---------------
@@ -227,28 +227,44 @@
---------------------------------
If you want to work on a feature long-term (perhaps you're implementing a
-PEP, or even removing the GIL), you will want to publish your work somewhere.
-We then recommend that you maintain it in a dedicated repository.
+PEP), you will probably want to publish your work in a dedicated repository.
+The following instructions will help you do so on `hg.python.org
+<http://hg.python.org>`_'s infrastructure without requiring a lot of upstream
+bandwidth.
-First create a public (empty) repository on hg.python.org::
+Go to the main repository's Web page (http://hg.python.org/cpython/); there
+you find a box labelled "server-side clone". Enter the relative path of the
+repository you want to create on the server, for example ``features/mywork``;
+and press the button. A new repository gets created on the server with all
+the changesets of the original repository (it will seem very fast; this is
+normal).
- $ hg init ssh://hg@hg.python.org/features/mywork
-
-And do a local clone of that repository on your disk::
+You can now do a local clone of this repository on your disk::
$ hg clone ssh://hg@hg.python.org/features/mywork
$ cd mywork
-There, pull all the contents from the main repository, either from a local
-clone::
+.. commented out: old instructions (without server-side cloning)
- $ hg pull ../cpython
- $ hg update
+ First create a public (empty) repository on hg.python.org::
-or directly from the network (which is of course slower)::
+ $ hg init ssh://hg@hg.python.org/features/mywork
- $ hg pull http://hg.python.org/cpython
- $ hg update
+ And do a local clone of that repository on your disk::
+
+ $ hg clone ssh://hg@hg.python.org/features/mywork
+ $ cd mywork
+
+ There, pull all the contents from the main repository, either from a local
+ clone::
+
+ $ hg pull ../cpython
+ $ hg update
+
+ or directly from the network (which is of course slower)::
+
+ $ hg pull http://hg.python.org/cpython
+ $ hg update
It is recommended that you create a new named branch for your work, so as
to easily track changes. That named branch will exist in your feature
@@ -267,14 +283,15 @@
``http://hg.python.org/features/mywork`` for the read-only URL).
When you want to synchronize your changes, you can pull from the main
-repository::
+repository, either from its remote URL::
+
+ $ hg pull http://hg.python.org/cpython
+
+or from a local clone that you may have on your disk (which is of course
+faster)::
$ hg pull ../cpython
-or from the network::
-
- $ hg pull http://hg.python.org/cpython
-
and merge all new changes from branch ``default`` to branch ``mywork``::
$ hg branch
--
Repository URL: http://hg.python.org/devguide
More information about the Python-checkins
mailing list