[Python-checkins] devguide: Fix instructions for dummy merges (Nadeem Vawda)
antoine.pitrou
python-checkins at python.org
Sat Mar 12 23:38:03 CET 2011
http://hg.python.org/devguide/rev/5c39e4d2decb
changeset: 388:5c39e4d2decb
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Mar 12 23:38:00 2011 +0100
summary:
Fix instructions for dummy merges (Nadeem Vawda)
files:
committing.rst
diff --git a/committing.rst b/committing.rst
--- a/committing.rst
+++ b/committing.rst
@@ -166,7 +166,7 @@
hg update default
hg merge 3.2
- hg revert -a
+ hg revert -ar default
hg commit
This is necessary so that the merge gets recorded; otherwise, somebody
--
Repository URL: http://hg.python.org/devguide
More information about the Python-checkins
mailing list