[Python-checkins] r68880 - peps/trunk/pep-0374.txt

[alexandre.vassalotti]

Author: alexandre.vassalotti
Date: Sat Jan 24 04:08:24 2009
New Revision: 68880

Log:
Address some of the comments made by Alexander Solovyov.


Modified:
   peps/trunk/pep-0374.txt

Modified: peps/trunk/pep-0374.txt
==============================================================================
--- peps/trunk/pep-0374.txt	(original)
+++ peps/trunk/pep-0374.txt	Sat Jan 24 04:08:24 2009
@@ -547,6 +547,8 @@
   hg commit -m "Reverted changeset 9150dd9c6d30"
   hg push
  
+Note, you can use "hg rollback" to revert the last change you committed in
+your local repository.
 
 git
 '''
@@ -784,7 +786,7 @@
 supported releases. Furthermore, it scales better when there is many
 changes to backport, because we do not need to seek the specific
 revision IDs to merge.
- 
+
 
 git
 '''
@@ -1038,11 +1040,13 @@
     # Edit some other code (e.g. socket).
     hg commit
     cd ../issue0000
-    hg fetch ../fix-socket-bug
+    hg pull ../fix-socket-bug
+    hg merge
     # Edit some more code.
     hg commit
     cd ../trunk
-    hg fetch ../issue0000
+    hg pull ../issue0000
+    hg merge
     hg push
     cd ..
     rm -rf issue0000 fix-socket-bug
@@ -1315,7 +1319,12 @@
 hg
 --
 
-N/A
+Alexander Solovyov comments:
+
+   Mercurial has easy to use extensive API with hooks for main events
+   and ability to extend commands. Also there is mq (mercurial queues)
+   extension, distributed with Mercurial, which simplifies work with
+   patches.
 
 
 git